[Asterisk-cvs] asterisk/pbx pbx_gtkconsole.c,1.13,1.14 pbx_spool.c,1.14,1.15 pbx_wilcalu.c,1.15,1.16

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/pbx
In directory mongoose.digium.com:/tmp/cvs-serv24705/pbx

Modified Files:
	pbx_gtkconsole.c pbx_spool.c pbx_wilcalu.c 
Log Message:
Merge remaining audit patch (save dlfcn.c)


Index: pbx_gtkconsole.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_gtkconsole.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pbx_gtkconsole.c	9 Jun 2004 01:45:08 -0000	1.13
+++ pbx_gtkconsole.c	14 Jul 2004 13:57:15 -0000	1.14
@@ -98,7 +98,7 @@
 	char *s2[2];
 	struct timeval tv;
 	int ms;
-	s2[0] = stuff;
+	s2[0] = (char *)stuff;
 	s2[1] = NULL;
 	gtk_clist_freeze(GTK_CLIST(verb));
 	if (replacelast) 
@@ -232,7 +232,7 @@
 	char tmp[AST_CONFIG_MAX_PATH];
 	char *module = gtk_file_selection_get_filename(fs);
 	char buf[256];
-	snprintf((char *)tmp,sizeof(tmp)-1,"%s/",(char *)ast_config_AST_MODULE_DIR);
+	snprintf(tmp, sizeof(tmp), "%s/", ast_config_AST_MODULE_DIR);
 	if (!strncmp(module, (char *)tmp, strlen(tmp))) 
 		module += strlen(tmp);
 	gdk_threads_leave();
@@ -251,7 +251,7 @@
 {
 	char tmp[AST_CONFIG_MAX_PATH];
 	GtkWidget *filew;
-	snprintf((char *)tmp,sizeof(tmp)-1,"%s/*.so",(char *)ast_config_AST_MODULE_DIR);
+	snprintf(tmp, sizeof(tmp), "%s/*.so", ast_config_AST_MODULE_DIR);
 	filew = gtk_file_selection_new("Load Module");
 	gtk_signal_connect(GTK_OBJECT (GTK_FILE_SELECTION(filew)->ok_button),
 					"clicked", GTK_SIGNAL_FUNC(file_ok_sel), filew);
@@ -332,8 +332,8 @@
 
 static int cli_activate(void)
 {
-	char buf[256];
-	strncpy(buf, gtk_entry_get_text(GTK_ENTRY(cli)), sizeof(buf));
+	char buf[256] = "";
+	strncpy(buf, gtk_entry_get_text(GTK_ENTRY(cli)), sizeof(buf) - 1);
 	gtk_entry_set_text(GTK_ENTRY(cli), "");
 	if (strlen(buf)) {
 		ast_cli_command(clipipe[1], buf);

Index: pbx_spool.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_spool.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pbx_spool.c	9 Jul 2004 21:34:24 -0000	1.14
+++ pbx_spool.c	14 Jul 2004 13:57:15 -0000	1.15
@@ -129,7 +129,7 @@
 							strncpy(o->dest, c2, sizeof(o->dest) - 1);
 						} else {
 							ast_log(LOG_NOTICE, "Channel should be in form Tech/Dest at line %d of %s\n", lineno, fn);
-							strcpy(o->tech, "");
+							o->tech[0] = '\0';
 						}
 					} else if (!strcasecmp(buf, "callerid")) {
 						strncpy(o->callerid, c, sizeof(o->callerid) - 1);
@@ -375,7 +375,7 @@
 {
 	pthread_t thread;
 	pthread_attr_t attr;
-	snprintf((char *)qdir,sizeof(qdir)-1,"%s/%s",(char *)ast_config_AST_SPOOL_DIR,"outgoing");
+	snprintf(qdir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing");
 	if (mkdir(qdir, 0700) && (errno != EEXIST)) {
 		ast_log(LOG_WARNING, "Unable to create queue directory %s -- outgoing spool disabled\n", qdir);
 		return 0;

Index: pbx_wilcalu.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_wilcalu.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pbx_wilcalu.c	29 Jun 2004 20:09:43 -0000	1.15
+++ pbx_wilcalu.c	14 Jul 2004 13:57:15 -0000	1.16
@@ -259,7 +259,7 @@
 {
 	int val;
 
-	snprintf((char *)dialfile, sizeof(dialfile)-1,"%s/%s", (char *)ast_config_AST_RUN_DIR,"autodial.ctl");
+	snprintf((char *)dialfile, sizeof(dialfile), "%s/%s", ast_config_AST_RUN_DIR, "autodial.ctl");
 	if((val=mkfifo(dialfile, 0700))) {
 		if(errno!=EEXIST){
 			ast_log(LOG_ERROR, "Error:%d Creating Autodial FIFO\n",errno);