[Asterisk-cvs] asterisk/apps app_controlplayback.c,1.3,1.4 app_voicemail.c,1.101,1.102
citats at lists.digium.com
citats at lists.digium.com
Wed May 26 19:52:46 CDT 2004
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/home/citats/cvs/asterisk/apps
Modified Files:
app_controlplayback.c app_voicemail.c
Log Message:
More formatting fixes
Index: app_controlplayback.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_controlplayback.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- app_controlplayback.c 26 May 2004 23:56:41 -0000 1.3
+++ app_controlplayback.c 27 May 2004 00:07:18 -0000 1.4
@@ -57,33 +57,31 @@
char tmp[256];
char *skip = NULL, *fwd = NULL, *rev = NULL, *stop = NULL, *pause = NULL, *file = NULL;
-
if (!data || ast_strlen_zero((char *)data)) {
ast_log(LOG_WARNING, "ControlPlayback requires an argument (filename)\n");
return -1;
}
-
strncpy(tmp, (char *)data, sizeof(tmp)-1);
file = tmp;
- if((skip=strchr(tmp,'|'))) {
+ if ((skip=strchr(tmp,'|'))) {
*skip = '\0';
*skip++;
fwd=strchr(skip,'|');
- if(fwd) {
+ if (fwd) {
*fwd = '\0';
*fwd++;
rev = strchr(fwd,'|');
- if(rev) {
+ if (rev) {
*rev = '\0';
*rev++;
stop = strchr(rev,'|');
- if(stop) {
+ if (stop) {
*stop = '\0';
*stop++;
pause = strchr(stop,'|');
- if(pause) {
+ if (pause) {
*pause = '\0';
*pause++;
}
@@ -93,19 +91,18 @@
}
skipms = skip ? atoi(skip) : 3000;
- if(!skipms)
+ if (!skipms)
skipms = 3000;
- if(!fwd || ! is_on_phonepad(*fwd))
+ if (!fwd || !is_on_phonepad(*fwd))
fwd = "#";
- if(!rev || ! is_on_phonepad(*rev))
+ if (!rev || !is_on_phonepad(*rev))
rev = "*";
- if(stop && ! is_on_phonepad(*stop))
+ if (stop && !is_on_phonepad(*stop))
stop = NULL;
- if(pause && ! is_on_phonepad(*pause))
+ if (pause && !is_on_phonepad(*pause))
pause = NULL;
-
LOCAL_USER_ADD(u);
res = ast_control_streamfile(chan, file, fwd, rev, stop, pause, skipms);
Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- app_voicemail.c 26 May 2004 23:56:41 -0000 1.101
+++ app_voicemail.c 27 May 2004 00:07:18 -0000 1.102
@@ -152,7 +152,7 @@
static char *tdesc = "Comedian Mail (Voicemail System)";
static char *adapp = "\x00\x00\x00\x0F";
-
+
static char *adsec = "\x9B\xDB\xF7\xAC";
static char *addesc = "Comedian Mail";
@@ -2549,7 +2549,7 @@
static int wait_file(struct ast_channel *chan, struct vm_state *vms, char *file)
{
- return ast_control_streamfile(chan, file, "#", "*","1","0", skipms);
+ return ast_control_streamfile(chan, file, "#", "*", "1", "0", skipms);
}
static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *vmu, char *origtime, char *filename)
More information about the svn-commits
mailing list