Index: apps/app_dial.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v retrieving revision 1.113 diff -u -r1.113 app_dial.c --- apps/app_dial.c 16 Dec 2004 03:15:20 -0000 1.113 +++ apps/app_dial.c 19 Dec 2004 11:09:45 -0000 @@ -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: apps/app_festival.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_festival.c,v retrieving revision 1.27 diff -u -r1.27 app_festival.c --- apps/app_festival.c 16 Oct 2004 16:00:04 -0000 1.27 +++ apps/app_festival.c 19 Dec 2004 11:09:45 -0000 @@ -120,7 +120,7 @@ if (x != fd) close(x); } -//IAS +/*IAS */ #ifdef __PPC__ for( x=0; x -1) -// kill(pid, SIGKILL); + +/* if (pid > -1) */ +/* kill(pid, SIGKILL); */ if (!res && owriteformat) ast_set_write_format(chan, owriteformat); return res; Index: apps/app_meetme.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v retrieving revision 1.65 diff -u -r1.65 app_meetme.c --- apps/app_meetme.c 25 Nov 2004 03:23:07 -0000 1.65 +++ apps/app_meetme.c 19 Dec 2004 11:09:45 -0000 @@ -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: apps/app_mp3.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_mp3.c,v retrieving revision 1.21 diff -u -r1.21 app_mp3.c --- apps/app_mp3.c 15 Sep 2004 19:27:23 -0000 1.21 +++ apps/app_mp3.c 19 Dec 2004 11:09:45 -0000 @@ -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: apps/app_queue.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v retrieving revision 1.98 diff -u -r1.98 app_queue.c --- apps/app_queue.c 6 Dec 2004 05:54:16 -0000 1.98 +++ apps/app_queue.c 19 Dec 2004 11:09:46 -0000 @@ -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: apps/app_sql_postgres.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_sql_postgres.c,v retrieving revision 1.7 diff -u -r1.7 app_sql_postgres.c --- apps/app_sql_postgres.c 14 Jul 2004 07:34:34 -0000 1.7 +++ apps/app_sql_postgres.c 19 Dec 2004 11:09:46 -0000 @@ -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