[Asterisk-cvs] asterisk/apps app_macro.c,1.12,1.13 app_zapbarge.c,1.3,1.4

[citats at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/home/citats/cvs/asterisk/apps

Modified Files:
	app_macro.c app_zapbarge.c 
Log Message:
ast_strlen_zero changes


Index: app_macro.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_macro.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_macro.c	4 Mar 2004 05:57:47 -0000	1.12
+++ app_macro.c	8 May 2004 08:07:47 -0000	1.13
@@ -18,6 +18,7 @@
 #include <asterisk/pbx.h>
 #include <asterisk/module.h>
 #include <asterisk/options.h>
+#include <asterisk/utils.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -73,14 +74,14 @@
   char *save_macro_priority;
   char *save_macro_offset;
   
-  if (!data || !strlen(data)) {
+  if (!data || ast_strlen_zero(data)) {
     ast_log(LOG_WARNING, "Invalid Macro incantation\n");
     return 0;
   }
   strncpy(tmp, data, sizeof(tmp) - 1);
   rest = tmp;
   macro = strsep(&rest, "|");
-  if (!macro || !strlen(macro)) {
+  if (!macro || ast_strlen_zero(macro)) {
   	ast_log(LOG_WARNING, "Invalid macro name specified\n");
 	return 0;
   }
@@ -96,7 +97,7 @@
   oldpriority = chan->priority;
   strncpy(oldexten, chan->exten, sizeof(oldexten) - 1);
   strncpy(oldcontext, chan->context, sizeof(oldcontext) - 1);
-  if (!strlen(chan->macrocontext)) {
+  if (ast_strlen_zero(chan->macrocontext)) {
 	strncpy(chan->macrocontext, chan->context, sizeof(chan->macrocontext) - 1);
 	strncpy(chan->macroexten, chan->exten, sizeof(chan->macroexten) - 1);
 	chan->macropriority = chan->priority;

Index: app_zapbarge.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_zapbarge.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- app_zapbarge.c	6 Apr 2004 22:17:31 -0000	1.3
+++ app_zapbarge.c	8 May 2004 08:07:47 -0000	1.4
@@ -25,6 +25,7 @@
 #include <asterisk/options.h>
 #include <asterisk/cli.h>
 #include <asterisk/say.h>
+#include <asterisk/utils.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -246,7 +247,7 @@
 	int confno = 0;
 	char confstr[80];
 
-	if (data && strlen(data)) {
+	if (data && !ast_strlen_zero(data)) {
 		if ((sscanf(data, "Zap/%d", &confno) != 1) &&
 		    (sscanf(data, "%d", &confno) != 1)) {
 			ast_log(LOG_WARNING, "ZapBarge Argument (if specified) must be a channel number, not '%s'\n", (char *)data);