diff options
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/app_dial.c | 6 | ||||
-rwxr-xr-x | apps/app_festival.c | 9 | ||||
-rwxr-xr-x | apps/app_meetme.c | 2 | ||||
-rwxr-xr-x | apps/app_mp3.c | 4 | ||||
-rwxr-xr-x | apps/app_queue.c | 6 | ||||
-rwxr-xr-x | apps/app_sql_postgres.c | 30 | ||||
-rwxr-xr-x | apps/app_voicemail.c | 6 |
7 files changed, 31 insertions, 32 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 89cf37521..f3e9ccfe6 100755 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1013,15 +1013,15 @@ static int dial_exec(struct ast_channel *chan, void *data) 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); diff --git a/apps/app_festival.c b/apps/app_festival.c index 7b6f68634..13eaa26b2 100755 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -120,7 +120,7 @@ static int send_waveform_to_fd(char *waveform, int length, int fd) { if (x != fd) close(x); } -//IAS +/*IAS */ #ifdef __PPC__ for( x=0; x<length; x+=2) { @@ -216,7 +216,7 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in 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 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in } 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; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 637ebef83..df93d39b8 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -799,7 +799,7 @@ zapretry: } } 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; diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 0cd8dfa59..e8f04c662 100755 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -38,8 +38,8 @@ static char *synopsis = "Play an MP3 file or stream"; 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; diff --git a/apps/app_queue.c b/apps/app_queue.c index 4b7bae711..f892915b7 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -124,7 +124,7 @@ static char *descrip = " 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 @@ static int wait_a_bit(struct queue_ent *qe) 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 @@ static int queue_exec(struct ast_channel *chan, void *data) } } -// 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); diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c index 1620df635..f2e99dea4 100755 --- a/apps/app_sql_postgres.c +++ b/apps/app_sql_postgres.c @@ -226,7 +226,7 @@ static int aPGSQL_connect(struct ast_channel *chan, void *data) { 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 @@ static int aPGSQL_query(struct ast_channel *chan, void *data) { 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 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) { 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 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) { } 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 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) { 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 @@ static int aPGSQL_reset(struct ast_channel *chan, void *data) { 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 @@ static int aPGSQL_clear(struct ast_channel *chan, void *data) { 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 @@ static int aPGSQL_disconnect(struct ast_channel *chan, void *data) { 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) { diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 751cde0ff..2a6986280 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1299,7 +1299,7 @@ yuck: #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 @@ leave_vm_out: 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]; |