[Asterisk-cvs] asterisk callerid.c,1.15,1.16

[citats at lists.digium.com]

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

Modified Files:
	callerid.c 
Log Message:
Change strlen calls to ast_strlen_zero in callerid.c


Index: callerid.c
===================================================================
RCS file: /usr/cvsroot/asterisk/callerid.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- callerid.c	4 Apr 2004 22:14:10 -0000	1.15
+++ callerid.c	4 May 2004 06:42:06 -0000	1.16
@@ -26,6 +26,7 @@
 #include <asterisk/callerid.h>
 #include <asterisk/logger.h>
 #include <asterisk/fskmodem.h>
+#include <asterisk/utils.h>
 
 struct callerid_state {
 	fsk_data fskd;
@@ -291,14 +292,14 @@
 				if (!strcmp(cid->number, "P")) {
 					strcpy(cid->number, "");
 					cid->flags |= CID_PRIVATE_NUMBER;
-				} else if (!strcmp(cid->number, "O") || !strlen(cid->number)) {
+				} else if (!strcmp(cid->number, "O") || ast_strlen_zero(cid->number)) {
 					strcpy(cid->number, "");
 					cid->flags |= CID_UNKNOWN_NUMBER;
 				}
 				if (!strcmp(cid->name, "P")) {
 					strcpy(cid->name, "");
 					cid->flags |= CID_PRIVATE_NAME;
-				} else if (!strcmp(cid->name, "O") || !strlen(cid->name)) {
+				} else if (!strcmp(cid->name, "O") || ast_strlen_zero(cid->name)) {
 					strcpy(cid->name, "");
 					cid->flags |= CID_UNKNOWN_NAME;
 				}
@@ -341,7 +342,7 @@
 				tm.tm_mday, tm.tm_hour, tm.tm_min);
 	size -= res;
 	ptr += res;
-	if (!number || !strlen(number) || (flags & CID_UNKNOWN_NUMBER)) {
+	if (!number || ast_strlen_zero(number) || (flags & CID_UNKNOWN_NUMBER)) {
 		/* Indicate number not known */
 		res = snprintf(ptr, size, "\004\001O");
 		size -= res;
@@ -365,7 +366,7 @@
 		size -= i;
 	}
 
-	if (!name || !strlen(name) || (flags & CID_UNKNOWN_NAME)) {
+	if (!name || ast_strlen_zero(name) || (flags & CID_UNKNOWN_NAME)) {
 		/* Indicate name not known */
 		res = snprintf(ptr, size, "\010\001O");
 		size -= res;
@@ -508,7 +509,7 @@
 int ast_isphonenumber(char *n)
 {
 	int x;
-	if (!n || !strlen(n))
+	if (!n || ast_strlen_zero(n))
 		return 0;
 	for (x=0;n[x];x++)
 		if (!strchr("0123456789*#+", n[x]))
@@ -537,7 +538,7 @@
 		} else {
 			/* Just trim off any trailing spaces */
 			*name = instr;
-			while(strlen(instr) && (instr[strlen(instr) - 1] < 33))
+			while(!ast_strlen_zero(instr) && (instr[strlen(instr) - 1] < 33))
 				instr[strlen(instr) - 1] = '\0';
 			/* And leading spaces */
 			while(**name && (**name < 33))