[Asterisk-cvs]
asterisk/apps app_dial.c, 1.113, 1.114 app_festival.c,
1.27, 1.28 app_meetme.c, 1.65, 1.66 app_mp3.c, 1.21,
1.22 app_queue.c, 1.98, 1.99 app_sql_postgres.c, 1.7,
1.8 app_voicemail.c, 1.181, 1.182
markster at lists.digium.com
markster at lists.digium.com
Sun Dec 19 16:17:38 CST 2004
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv6173/apps
Modified Files:
app_dial.c app_festival.c app_meetme.c app_mp3.c app_queue.c
app_sql_postgres.c app_voicemail.c
Log Message:
Merge Olle's comment patch (bug #3097)
Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- app_dial.c 16 Dec 2004 03:15:20 -0000 1.113
+++ app_dial.c 19 Dec 2004 21:13:41 -0000 1.114
@@ -1013,15 +1013,15 @@
ast_channel_sendurl( peer, url );
} /* /JDG */
if (announce && announcemsg) {
- // Start autoservice on the other chan
+ /* Start autoservice on the other chan */
res = ast_autoservice_start(chan);
- // Now Stream the File
+ /* Now Stream the File */
if (!res)
res = ast_streamfile(peer,announcemsg,peer->language);
if (!res) {
digit = ast_waitstream(peer, AST_DIGIT_ANY);
}
- // Ok, done. stop autoservice
+ /* Ok, done. stop autoservice */
res = ast_autoservice_stop(chan);
if (digit > 0 && !res)
res = ast_senddigit(chan, digit);
Index: app_festival.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_festival.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- app_festival.c 16 Oct 2004 16:00:04 -0000 1.27
+++ app_festival.c 19 Dec 2004 21:13:41 -0000 1.28
@@ -120,7 +120,7 @@
if (x != fd)
close(x);
}
-//IAS
+/*IAS */
#ifdef __PPC__
for( x=0; x<length; x+=2)
{
@@ -216,7 +216,7 @@
res = -1;
break;
}
- if (res < needed) { // last frame
+ if (res < needed) { /* last frame */
ast_log(LOG_DEBUG, "Last frame\n");
res=0;
break;
@@ -231,8 +231,9 @@
}
close(fds[0]);
close(fds[1]);
-// if (pid > -1)
-// kill(pid, SIGKILL);
+
+/* if (pid > -1) */
+/* kill(pid, SIGKILL); */
if (!res && owriteformat)
ast_set_write_format(chan, owriteformat);
return res;
Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- app_meetme.c 25 Nov 2004 03:23:07 -0000 1.65
+++ app_meetme.c 19 Dec 2004 21:13:41 -0000 1.66
@@ -799,7 +799,7 @@
}
}
if (user->adminflags & ADMINFLAG_KICKME) {
- //You have been kicked.
+ /* You have been kicked. */
if (!ast_streamfile(chan, "conf-kicked", chan->language))
ast_waitstream(chan, "");
ret = 0;
Index: app_mp3.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_mp3.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- app_mp3.c 15 Sep 2004 19:27:23 -0000 1.21
+++ app_mp3.c 19 Dec 2004 21:13:41 -0000 1.22
@@ -38,8 +38,8 @@
static char *descrip =
" MP3Player(location) Executes mpg123 to play the given location\n"
-"which typically would be a filename or a URL. Returns -1 on\n"
-"hangup or 0 otherwise. User can exit by pressing any key\n.";
+"which typically would be a filename o a URL. User can exit by pressing any key\n."
+"Returns -1 on hangup or 0 otherwise.";
STANDARD_LOCAL_USER;
Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- app_queue.c 6 Dec 2004 05:54:16 -0000 1.98
+++ app_queue.c 19 Dec 2004 21:13:41 -0000 1.99
@@ -124,7 +124,7 @@
" The timeout will cause the queue to fail out after a specified number of\n"
"seconds, checked between each queues.conf 'timeout' and 'retry' cycle.\n";
-// [PHM 06/26/03]
+/* PHM 06/26/03 */
static char *app_aqm = "AddQueueMember" ;
static char *app_aqm_synopsis = "Dynamically adds queue members" ;
static char *app_aqm_descrip =
@@ -1506,7 +1506,7 @@
return ast_waitfordigit(qe->chan, retrywait);
}
-// [PHM 06/26/03]
+/* [PHM 06/26/03] */
static struct member * interface_exists( struct ast_call_queue * q, char * interface )
{
@@ -1994,7 +1994,7 @@
}
}
-// if (option_debug)
+/* if (option_debug) */
ast_log(LOG_DEBUG, "queue: %s, options: %s, url: %s, announce: %s, timeout: %d, priority: %d\n",
queuename, options, url, announceoverride, qe.queuetimeout, (int)prio);
Index: app_sql_postgres.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_sql_postgres.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_sql_postgres.c 14 Jul 2004 07:34:34 -0000 1.7
+++ app_sql_postgres.c 19 Dec 2004 21:13:41 -0000 1.8
@@ -226,7 +226,7 @@
s1=malloc(l);
strncpy(s1, data, l -1);
stringp=s1;
- strsep(&stringp," "); // eat the first token, we already know it :P
+ strsep(&stringp," "); /* eat the first token, we already know it :P */
var=strsep(&stringp," ");
optionstring=strsep(&stringp,"\n");
@@ -267,9 +267,9 @@
s2=malloc(l);
strncpy(s1, data, l - 1);
stringp=s1;
- strsep(&stringp," "); // eat the first token, we already know it :P
+ strsep(&stringp," "); /* eat the first token, we already know it :P */
s3=strsep(&stringp," ");
- while (1) { // ugly trick to make branches with break;
+ while (1) { /* ugly trick to make branches with break; */
var=s3;
s4=strsep(&stringp," ");
id=atoi(s4);
@@ -330,10 +330,10 @@
s2=malloc(l);
strncpy(s1, data, l - 1);
stringp=s1;
- strsep(&stringp," "); // eat the first token, we already know it :P
+ strsep(&stringp," "); /* eat the first token, we already know it :P */
fetchid_var=strsep(&stringp," ");
- while (1) { // ugly trick to make branches with break;
- var=fetchid_var; // fetchid
+ while (1) { /* ugly trick to make branches with break; */
+ var=fetchid_var; /* fetchid */
fnd=0;
AST_LIST_TRAVERSE(headp,variables,entries) {
@@ -350,19 +350,19 @@
}
s4=strsep(&stringp," ");
- id=atoi(s4); // resultid
+ id=atoi(s4); /* resultid */
if ((PGSQLres=find_identifier(id,AST_PGSQL_ID_RESID))==NULL) {
ast_log(LOG_WARNING,"Invalid result identifier %d passed in aPGSQL_fetch\n",id);
res=-1;
break;
}
- id=atoi(s7); //fetchid
+ id=atoi(s7); /*fetchid */
if ((lalares=find_identifier(id,AST_PGSQL_ID_FETCHID))==NULL) {
- i=0; // fetching the very first row
+ i=0; /* fetching the very first row */
} else {
i=*lalares;
free(lalares);
- del_identifier(id,AST_PGSQL_ID_FETCHID); // will re-add it a bit later
+ del_identifier(id,AST_PGSQL_ID_FETCHID); /* will re-add it a bit later */
}
if (i<PQntuples(PGSQLres)) {
@@ -383,11 +383,11 @@
pbx_builtin_setvar_helper(chan,s5,s6);
}
lalares=malloc(sizeof(int));
- *lalares = ++i; // advance to the next row
+ *lalares = ++i; /* advance to the next row */
id1 = add_identifier(AST_PGSQL_ID_FETCHID,lalares);
} else {
ast_log(LOG_WARNING,"ast_PGSQL_fetch : EOF\n");
- id1 = 0; // no more rows
+ id1 = 0; /* no more rows */
}
snprintf(s, sizeof(s), "%d", id1);
ast_log(LOG_WARNING,"Setting var '%s' to value '%s'\n",fetchid_var,s);
@@ -413,7 +413,7 @@
s1=malloc(l);
strncpy(s1, data, l - 1);
stringp=s1;
- strsep(&stringp," "); // eat the first token, we already know it :P
+ strsep(&stringp," "); /* eat the first token, we already know it :P */
s3=strsep(&stringp," ");
id=atoi(s3);
if ((karoto=find_identifier(id,AST_PGSQL_ID_CONNID))==NULL) {
@@ -439,7 +439,7 @@
s1=malloc(l);
strncpy(s1, data, l - 1);
stringp=s1;
- strsep(&stringp," "); // eat the first token, we already know it :P
+ strsep(&stringp," "); /* eat the first token, we already know it :P */
s3=strsep(&stringp," ");
id=atoi(s3);
if ((karoto=find_identifier(id,AST_PGSQL_ID_RESID))==NULL) {
@@ -469,7 +469,7 @@
s1=malloc(l);
strncpy(s1, data, l - 1);
stringp=s1;
- strsep(&stringp," "); // eat the first token, we already know it :P
+ strsep(&stringp," "); /* eat the first token, we already know it :P */
s3=strsep(&stringp," ");
id=atoi(s3);
if ((karoto=find_identifier(id,AST_PGSQL_ID_CONNID))==NULL) {
Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- app_voicemail.c 17 Dec 2004 15:08:55 -0000 1.181
+++ app_voicemail.c 19 Dec 2004 21:13:41 -0000 1.182
@@ -1299,7 +1299,7 @@
#else
static int count_messages(char *dir)
{
- // Find all .txt files - even if they are not in sequence from 0000
+ /* Find all .txt files - even if they are not in sequence from 0000 */
int vmcount = 0;
DIR *vmdir = NULL;
@@ -2214,12 +2214,10 @@
return res;
}
-#ifdef USE_ODBC_STORAGE
-#endif
static void resequence_mailbox(char * dir)
{
- // we know max messages, so stop process when number is hit
+ /* we know max messages, so stop process when number is hit */
int x,dest;
char sfn[256];
More information about the svn-commits
mailing list