Revision

15248

Author

anthm

Date

2009-10-27 09:26:16 -0500 (Tue, 27 Oct 2009)

Log Message

convert contrib mods to zstr

Modified Paths

• freeswitch/trunk/contrib/cparker/mod_xml_radius/mod_xml_radius.c
• freeswitch/trunk/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c
• freeswitch/trunk/contrib/jtregunna/mod_fastsms/mod_fastsms.c

Diff

--- freeswitch/trunk/contrib/cparker/mod_xml_radius/mod_xml_radius.c	2009-10-27 14:01:13 UTC (rev 15247)
+++ freeswitch/trunk/contrib/cparker/mod_xml_radius/mod_xml_radius.c	2009-10-27 14:26:16 UTC (rev 15248)
@@ -157,7 +157,7 @@
 		return SWITCH_STATUS_FALSE;
 	}
 
-	if (switch_strlen_zero(cmd)) {
+	if (zstr(cmd)) {
 		goto usage;
 	}
 
@@ -188,7 +188,7 @@
     switch_xml_t xml_in_tmp = NULL;
     int i;
 
-	if (switch_strlen_zero(xml_out->name)) {
+	if (zstr(xml_out->name)) {
 		xml_out->name = strdup(xml_in->name);
 	} else if (!(xml_out = switch_xml_add_child_d(xml_out, xml_in->name, *off++))) {
         return SWITCH_STATUS_FALSE;
@@ -540,7 +540,7 @@
 		binding->bindings = strdup(bname);
 
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML RADIUS Fetch Function [%s]\n",
-			switch_strlen_zero(bname) ? "N/A" : bname, binding->bindings ? binding->bindings : "all");
+			zstr(bname) ? "N/A" : bname, binding->bindings ? binding->bindings : "all");
 		switch_xml_bind_search_function(xml_radius_search, switch_xml_parse_section_string(bname), binding);
 		binding = NULL;
 	}

--- freeswitch/trunk/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c	2009-10-27 14:01:13 UTC (rev 15247)
+++ freeswitch/trunk/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c	2009-10-27 14:26:16 UTC (rev 15248)
@@ -191,22 +191,22 @@
 	
 /* Set defaults for any variables still not set */
 setdefaults:
-	if (switch_strlen_zero(globals.db_username)) {
+	if (zstr(globals.db_username)) {
 		set_global_db_username("bandwidth.com");
 	}
-	if (switch_strlen_zero(globals.db_password)) {
+	if (zstr(globals.db_password)) {
 		set_global_db_password("dev");
 	}
-	if (switch_strlen_zero(globals.db_dsn)) {
+	if (zstr(globals.db_dsn)) {
 		set_global_db_dsn("bandwidth.com");
 	}
-	if (switch_strlen_zero(globals.percall_action)) {
+	if (zstr(globals.percall_action)) {
 		set_global_percall_action("hangup");
 	}
-	if (switch_strlen_zero(globals.lowbal_action)) {
+	if (zstr(globals.lowbal_action)) {
 		set_global_lowbal_action("play ding");
 	}
-	if (switch_strlen_zero(globals.nobal_action)) {
+	if (zstr(globals.nobal_action)) {
 		set_global_nobal_action("hangup");
 	}
 
@@ -719,7 +719,7 @@
 	char *lbuf = NULL;
 	char *argv[3] = { 0 };
 
-	if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data))
+	if (!zstr(data) && (lbuf = switch_core_session_strdup(session, data))
 		&& (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
 		if (!strcasecmp(argv[0], "adjust") && argc == 2) {
 			nibblebill_adjust(session, atof(argv[1]));
@@ -748,9 +748,9 @@
 	char *mycmd = NULL, *argv[3] = { 0 };
 	int argc = 0;
 
-	if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) {
+	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
 		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-		if ((argc == 2 || argc == 3) && !switch_strlen_zero(argv[0])) {
+		if ((argc == 2 || argc == 3) && !zstr(argv[0])) {
 			char *uuid = argv[0];
 			if ((psession = switch_core_session_locate(uuid))) {
 				switch_channel_t *channel;

--- freeswitch/trunk/contrib/jtregunna/mod_fastsms/mod_fastsms.c	2009-10-27 14:01:13 UTC (rev 15247)
+++ freeswitch/trunk/contrib/jtregunna/mod_fastsms/mod_fastsms.c	2009-10-27 14:26:16 UTC (rev 15248)
@@ -88,7 +88,7 @@
 	char* text = NULL;
 	const char* originator = switch_channel_get_variable(channel, "fastsms_originator");
 
-	if (!switch_strlen_zero(data)) {
+	if (!zstr(data)) {
 		msisdn = switch_core_session_strdup(session, data);
 		text = strchr(msisdn, ' ');
 		if (text)