Index: channels/chan_skinny.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v retrieving revision 1.59 diff -u -r1.59 chan_skinny.c --- channels/chan_skinny.c 26 Oct 2004 22:25:43 -0000 1.59 +++ channels/chan_skinny.c 19 Dec 2004 10:56:46 -0000 @@ -3,7 +3,7 @@ * * Implementation of the Skinny protocol * - * Asterisk is Copyright (C) 1999-2003 Mark Spencer + * Copyright (C) 1999-2004 Digium, inc * * chan_skinny was developed by Jeremy McNamara & Florian Overkamp * @@ -1449,7 +1449,7 @@ ((exten[0] != '*') || (!ast_strlen_zero(exten) > 2))) { ast_log(LOG_WARNING, "Can't match [%s] from '%s' in context %s\n", exten, chan->cid.cid_num ? chan->cid.cid_num : "", chan->context); transmit_tone(s, SKINNY_REORDER); - sleep(3); // hang out for 3 seconds to let congestion play + sleep(3); /* hang out for 3 seconds to let congestion play */ break; } if (!timeout) @@ -2716,7 +2716,7 @@ int reload(void) { #if 0 -// XXX Causes Seg +/* XXX Causes Seg - needs to be fixed, or? */ delete_devices(); reload_config(); Index: codecs/codec_adpcm.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_adpcm.c,v retrieving revision 1.12 diff -u -r1.12 codec_adpcm.c --- codecs/codec_adpcm.c 15 Nov 2004 00:56:53 -0000 1.12 +++ codecs/codec_adpcm.c 19 Dec 2004 10:56:46 -0000 @@ -5,9 +5,10 @@ * Based on frompcm.c and topcm.c from the Emiliano MIPL browser/ * interpreter. See http://www.bsdtelephony.com.mx * - * Copyright (c) 2001 Linux Support Services, Inc. All rights reserved. + * Copyright (c) 2001-2004 Digium, inc + * All rights reserved. * - * Karl Sackett , 2001-3-21 + * Karl Sackett , 2001-03-21 * * This program is free software, distributed under the terms of * the GNU General Public License Index: codecs/codec_g726.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_g726.c,v retrieving revision 1.4 diff -u -r1.4 codec_g726.c --- codecs/codec_g726.c 15 Nov 2004 00:56:53 -0000 1.4 +++ codecs/codec_g726.c 19 Dec 2004 10:56:47 -0000 @@ -5,7 +5,7 @@ * Based on frompcm.c and topcm.c from the Emiliano MIPL browser/ * interpreter. See http://www.bsdtelephony.com.mx * - * Copyright (c) 2004, Digium + * Copyright (c) 2004, Digium, inc * * Mark Spencer * Index: codecs/codec_lpc10.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/codec_lpc10.c,v retrieving revision 1.9 diff -u -r1.9 codec_lpc10.c --- codecs/codec_lpc10.c 22 Jun 2004 18:49:00 -0000 1.9 +++ codecs/codec_lpc10.c 19 Dec 2004 10:56:47 -0000 @@ -8,9 +8,9 @@ * * See http://www.arl.wustl.edu/~jaf/ * - * Copyright (C) 1999, Mark Spencer + * Copyright (C) 1999-2004 Digium,inc * - * Mark Spencer + * Mark Spencer * * This program is free software, distributed under the terms of * the GNU General Public License Index: utils/smsq.c =================================================================== RCS file: /usr/cvsroot/asterisk/utils/smsq.c,v retrieving revision 1.2 diff -u -r1.2 smsq.c --- utils/smsq.c 12 Dec 2004 23:29:47 -0000 1.2 +++ utils/smsq.c 19 Dec 2004 10:56:47 -0000 @@ -10,8 +10,8 @@ #include #include -// SMS queuing application for use with asterisk app_sms -// by Adrian Kennard, 2004 +/* SMS queuing application for use with asterisk app_sms */ +/* by Adrian Kennard, 2004 */ /* reads next USC character from null terminated UTF-8 string and advanced pointer */ /* for non valid UTF-8 sequences, returns character as is */ @@ -65,8 +65,8 @@ return *p; /* not sensible */ } -// check for any queued messages in specific queue (queue="" means any queue) -// returns 0 if nothing queued, 1 if queued and outgoing set up OK, 2 of outgoing exists +/* check for any queued messages in specific queue (queue="" means any queue) */ +/* returns 0 if nothing queued, 1 if queued and outgoing set up OK, 2 of outgoing exists */ static char txqcheck (char *dir, char *queue, char subaddress, char *channel, char *callerid, int wait, int delay, int retries, int concurrent) { char ogname[100], @@ -90,7 +90,7 @@ return 0; } if (!ql) - { // not searching any specific queue, so use whatr we found as the queue + { /* not searching any specific queue, so use whatr we found as the queue */ queue = fn->d_name; ql = p - queue; } @@ -150,18 +150,18 @@ try++; snprintf(ogname, sizeof(ogname), "outgoing/smsq.%s.%s.%d", dir, queue, try); if (!link (temp, ogname)) - { // queued OK + { /* queued OK */ unlink (temp); return 1; } } } - // failed to create call queue + /* failed to create call queue */ unlink (temp); return 2; } -// Process received queue entries and run through a process, setting environment variables +/* Process received queue entries and run through a process, setting environment variables */ static void rxqcheck (char *dir, char *queue, char *process) { unsigned char *p; @@ -186,7 +186,7 @@ FILE *f; snprintf (filename, sizeof(filename), "sms/%s/%s", dir, fn->d_name); if (rename (filename, temp)) - continue; // cannot access file + continue; /* cannot access file */ f = fopen (temp, "r"); unlink (temp); if (!f) @@ -229,7 +229,7 @@ while (isspace (*p)) *p++ = 0; if (*p == '=') - { // = + { /* = */ *p++ = 0; if (!strcmp (line, "oa") || !strcmp (line, "da") || !strcmp (line, "scts") || !strcmp (line, "pid") || !strcmp (line, "dcs") || !strcmp (line, "mr") || !strcmp (line, "vp")) @@ -237,7 +237,7 @@ else if ((!strcmp (line, "srr") || !strcmp (line, "rp")) && atoi (p)) setenv (line, "", 1); else if (!strcmp (line, "ud")) - { // read the user data as UTF-8 + { /* read the user data as UTF-8 */ long v; udl = 0; while ((v = utf8decode (&p)) && udl < 160) @@ -248,12 +248,12 @@ { *p++ = 0; if (*p == '#') - { // ## + { /* ## */ p++; if (!strcmp (line, "udh")) setenv (line, p, 1); else if (!strcmp (line, "ud")) - { // read user data UCS-2 + { /* read user data UCS-2 */ udl = 0; while (*p && udl < 160) { @@ -269,9 +269,9 @@ } } } else - { // # + { /* # */ if (!strcmp (line, "ud")) - { // read user data UCS-1 + { /* read user data UCS-1 */ udl = 0; while (*p && udl < 160) { @@ -287,7 +287,7 @@ } } fclose (f); - // set up user data variables + /* set up user data variables */ { char temp[481]; int n, @@ -367,13 +367,13 @@ } setenv ("ud16", temp, 1); } - // run the command + /* run the command */ system (process); } closedir (d); } -// Main app +/* Main app */ int main (int argc, const char *argv[]) { @@ -417,7 +417,7 @@ *defaultsubaddress = "9", subaddress = 0, *scts = 0; - poptContext optCon; // context for parsing command-line options + poptContext optCon; /* context for parsing command-line options */ const struct poptOption optionsTable[] = { {"queue", 'q', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &queue, 0, "Queue [inc sub address]", "number[-X]"}, {"da", 'd', POPT_ARG_STRING, &da, 0, "Destination address", "number"}, @@ -485,7 +485,7 @@ fprintf (stderr, "Command line arguments always treated as UTF-8\n"); return 1; } - // if (!where && poptPeekArg (optCon)) where = (char *) poptGetArg (optCon); + /* if (!where && poptPeekArg (optCon)) where = (char *) poptGetArg (optCon); */ if (!mt && !mo && process) mt = 1; if (!mt && !mo && oa) @@ -585,7 +585,7 @@ return 1; } if (udfile) - { // get message from file + { /* get message from file */ unsigned char dat[1204], *p = dat, *e; @@ -642,14 +642,14 @@ } if (oa || da) - { // send message + { /* send message */ char temp[100], queuename[100], *dir = (mo ? rx ? "sms/morx" : "sms/motx" : rx ? "sms/mtrx" : "sms/mttx"); FILE *f; snprintf (temp, sizeof(temp), "sms/.smsq-%d", getpid ()); - mkdir ("sms", 0777); // ensure directory exists - mkdir (dir, 0777); // ensure directory exists + mkdir ("sms", 0777); /* ensure directory exists */ + mkdir (dir, 0777); /* ensure directory exists */ snprintf (queuename, sizeof(queuename), "%s/%s.%ld-%d", dir, *queue ? queue : "0", (long)time (0), getpid ()); f = fopen (temp, "w"); if (!f) @@ -713,7 +713,7 @@ } if (!nodial && tx && !process) - { // dial to send messages + { /* dial to send messages */ char ret=0, try = 3; if (nowait) @@ -725,7 +725,7 @@ else ret = txqcheck ("mttx", queue, subaddress, mttxchannel, mttxcallerid, mttxwait, mttxdelay, mttxretries, concurrent); if (ret < 2) - break; // sent, or queued OK + break; /* sent, or queued OK */ if (try) sleep (1); }