[Asterisk-cvs]
asterisk/res res_agi.c, 1.18, 1.19 res_config_odbc.c,
1.16, 1.17 res_indications.c, 1.7, 1.8 res_monitor.c, 1.24, 1.25
markster at lists.digium.com
markster at lists.digium.com
Sat Dec 18 17:07:58 CST 2004
Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv20470/res
Modified Files:
res_agi.c res_config_odbc.c res_indications.c res_monitor.c
Log Message:
Fix comment issues (bug #3089)
Index: res_agi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_agi.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- res_agi.c 14 Dec 2004 18:39:25 -0000 1.18
+++ res_agi.c 18 Dec 2004 22:04:07 -0000 1.19
@@ -276,7 +276,7 @@
close(fromast[0]);
if (efd) {
- // [PHM 12/18/03]
+ /* [PHM 12/18/03] */
close(audio[0]);
}
@@ -484,7 +484,7 @@
timeout = atoi(argv[4]);
else if (chan->pbx->dtimeout) {
/* by default dtimeout is set to 5sec */
- timeout = chan->pbx->dtimeout * 1000; //in msec
+ timeout = chan->pbx->dtimeout * 1000; /* in msec */
}
fs = ast_openstream(chan, argv[2], chan->language);
Index: res_config_odbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_config_odbc.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- res_config_odbc.c 24 Nov 2004 03:19:27 -0000 1.16
+++ res_config_odbc.c 18 Dec 2004 22:04:07 -0000 1.17
@@ -425,7 +425,7 @@
if (!file || !strcmp (file, "res_config_odbc.conf"))
- return NULL; // cant configure myself with myself !
+ return NULL; /* cant configure myself with myself ! */
obj = fetch_odbc_obj(database);
if (!obj)
@@ -518,7 +518,7 @@
}
}
- // next row
+ /* next row */
res = SQLFetch (stmt);
}
Index: res_indications.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_indications.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- res_indications.c 14 Jul 2004 13:57:15 -0000 1.7
+++ res_indications.c 18 Dec 2004 22:04:07 -0000 1.8
@@ -33,7 +33,7 @@
#include <asterisk/indications.h>
-// Globals
+/* Globals */
static const char dtext[] = "Indications Configuration";
static const char config[] = "indications.conf";
@@ -41,11 +41,11 @@
* Help for commands provided by this module ...
*/
static char help_add_indication[] =
-"Usage: add indication <country> <indication> \"<tonelist>\"\n"
+"Usage: indication add <country> <indication> \"<tonelist>\"\n"
" Add the given indication to the country.\n";
static char help_remove_indication[] =
-"Usage: remove indication <country> <indication>\n"
+"Usage: indication remove <country> <indication>\n"
" Remove the given indication from the country.\n";
static char help_show_indications[] =
@@ -292,7 +292,7 @@
country = strsep(&c,",");
}
} else {
- // add tone to country
+ /* add tone to country */
struct tone_zone_sound *ps,*ts;
for (ps=NULL,ts=tones->tones; ts; ps=ts, ts=ts->next) {
if (strcasecmp(v->name,ts->name)==0) {
@@ -341,12 +341,12 @@
* CLI entries for commands provided by this module
*/
static struct ast_cli_entry add_indication_cli =
- { { "add", "indication", NULL }, handle_add_indication,
+ { { "indication", "add", NULL }, handle_add_indication,
"Add the given indication to the country", help_add_indication,
NULL };
static struct ast_cli_entry remove_indication_cli =
- { { "remove", "indication", NULL }, handle_remove_indication,
+ { { "indication", "remove", NULL }, handle_remove_indication,
"Remove the given indication from the country", help_remove_indication,
NULL };
@@ -367,8 +367,8 @@
ast_cli_unregister(&add_indication_cli);
ast_cli_unregister(&remove_indication_cli);
ast_cli_unregister(&show_indications_cli);
- ast_unregister_application("Playlist");
- ast_unregister_application("StopPlaylist");
+ ast_unregister_application("Playtones");
+ ast_unregister_application("StopPlaytones");
return 0;
}
Index: res_monitor.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_monitor.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- res_monitor.c 9 Dec 2004 22:39:14 -0000 1.24
+++ res_monitor.c 18 Dec 2004 22:04:07 -0000 1.25
@@ -4,7 +4,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <libgen.h> //dirname()
+#include <libgen.h> /* dirname() */
#include <asterisk/lock.h>
#include <asterisk/channel.h>
@@ -65,7 +65,7 @@
/* Start monitoring a channel */
int ast_monitor_start( struct ast_channel *chan, const char *format_spec,
- const char *fname_base, int need_lock)
+ const char *fname_base, int need_lock)
{
int res = 0;
char tmp[256];
@@ -85,7 +85,7 @@
if (mkdir(AST_MONITOR_DIR, 0770) < 0) {
if (errno != EEXIST) {
ast_log(LOG_WARNING, "Unable to create audio monitor directory: %s\n",
- strerror(errno));
+ strerror(errno));
}
}
@@ -133,14 +133,14 @@
monitor->stop = ast_monitor_stop;
- // Determine file format
+ /* Determine file format */
if (format_spec && !ast_strlen_zero(format_spec)) {
monitor->format = strdup(format_spec);
} else {
monitor->format = strdup("wav");
}
- // open files
+ /* open files */
if (ast_fileexists(monitor->read_filename, NULL, NULL) > 0) {
ast_filedelete(monitor->read_filename, NULL);
}
@@ -410,7 +410,7 @@
}
if ((!fname) || (ast_strlen_zero(fname))) {
- // No filename base specified, default to channel name as per CLI
+ /* No filename base specified, default to channel name as per CLI */
fname = malloc (FILENAME_MAX);
if (!fname) {
astman_send_error(s, m, "Could not start monitoring channel");
@@ -419,7 +419,7 @@
}
memset(fname, 0, FILENAME_MAX);
strncpy(fname, c->name, FILENAME_MAX-1);
- // Channels have the format technology/channel_name - have to replace that /
+ /* Channels have the format technology/channel_name - have to replace that / */
if ((d=strchr(fname, '/'))) *d='-';
}
More information about the svn-commits
mailing list