Fix comment issues (bug #3089)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4479 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_agi.c

@@ -276,7 +276,7 @@ static int launch_script(char *script, char *argv[], int *fds, int *efd, int *op
 	close(fromast[0]);
 
 	if (efd) {
-		// [PHM 12/18/03]
+		/* [PHM 12/18/03] */
 		close(audio[0]);
 	}
 
@@ -484,7 +484,7 @@ static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char *
 		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);

res/res_config_odbc.c

@@ -425,7 +425,7 @@ static struct ast_config *config_odbc (const char *database, const char *table,
 
 
 	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 @@ static struct ast_config *config_odbc (const char *database, const char *table,
 				}
 			}
 
-		// next row 
+		/* next row  */
 			res = SQLFetch (stmt);
 		}
 

res/res_indications.c

@@ -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 @@ static const char config[] = "indications.conf";
  * 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 @@ static int ind_load_module(void)
 					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 @@ out:			v = v->next;
  * 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 @@ int unload_module(void)
 	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;
 }
 

res/res_monitor.c

@@ -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 @@ static char *changemonitor_descrip = "ChangeMonitor\n"
 
 /* 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 @@ int ast_monitor_start(	struct ast_channel *chan, const char *format_spec,
 		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 @@ int ast_monitor_start(	struct ast_channel *chan, const char *format_spec,
 
 		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 @@ static int start_monitor_action(struct mansession *s, struct message *m)
 	}
 
 	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 @@ static int start_monitor_action(struct mansession *s, struct message *m)
 		}
 		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='-';
 	}