issue #5648

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7011 f38db490-d61c-443f-a65b-d21fe96a405b

5 files changed, 22 insertions, 22 deletions

diff --git a/res/res_agi.c b/res/res_agi.c
index de3fcf0f7..9ec6f5cb6 100755
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2009,7 +2009,7 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
         char *stringp;
 	AGI agi;
 
-	if (!data || ast_strlen_zero(data)) {
+	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "AGI requires an argument (script)\n");
 		return -1;
 	}
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 10b3dab9f..bd19c6301 100755
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -168,7 +168,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
 		stringp = rowdata;
 		while(stringp) {
 			chunk = strsep(&stringp, ";");
-			if (chunk && !ast_strlen_zero(ast_strip(chunk))) {
+			if (!ast_strlen_zero(ast_strip(chunk))) {
 				if (prev) {
 					prev->next = ast_variable_new(coltitle, chunk);
 					if (prev->next)
@@ -320,7 +320,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
 			stringp = rowdata;
 			while(stringp) {
 				chunk = strsep(&stringp, ";");
-				if (chunk && !ast_strlen_zero(ast_strip(chunk))) {
+				if (!ast_strlen_zero(ast_strip(chunk))) {
 					if (initfield && !strcmp(initfield, coltitle))
 						ast_category_rename(cat, chunk);
 					var = ast_variable_new(coltitle, chunk);
diff --git a/res/res_features.c b/res/res_features.c
index 8e3be8d01..5ac3cdac0 100755
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -183,7 +183,7 @@ static void check_goto_on_transfer(struct ast_channel *chan)
 
 	goto_on_transfer = pbx_builtin_getvar_helper(chan, "GOTO_ON_BLINDXFR");
 
-	if (goto_on_transfer && !ast_strlen_zero(goto_on_transfer) && (xferchan = ast_channel_alloc(0))) {
+	if (!ast_strlen_zero(goto_on_transfer) && (xferchan = ast_channel_alloc(0))) {
 		char *x;
 		struct ast_frame *f;
 		
@@ -1002,7 +1002,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
 	}
 
 
-	if (dynamic_features && !ast_strlen_zero(dynamic_features)) {
+	if (!ast_strlen_zero(dynamic_features)) {
 		char *tmp = ast_strdupa(dynamic_features);
 		char *tok;
 
@@ -1868,7 +1868,7 @@ static int manager_parking_status( struct mansession *s, struct message *m )
 	char *id = astman_get_header(m,"ActionID");
 	char idText[256] = "";
 
-	if (id && !ast_strlen_zero(id))
+	if (!ast_strlen_zero(id))
 		snprintf(idText,256,"ActionID: %s\r\n",id);
 
 	astman_send_ack(s, m, "Parked calls will follow");
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 89fb5aef9..35366bdf0 100755
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -123,7 +123,7 @@ int ast_monitor_start(	struct ast_channel *chan, const char *format_spec,
 		memset(monitor, 0, sizeof(struct ast_channel_monitor));
 
 		/* Determine file names */
-		if (fname_base && !ast_strlen_zero(fname_base)) {
+		if (!ast_strlen_zero(fname_base)) {
 			int directory = strchr(fname_base, '/') ? 1 : 0;
 			/* try creating the directory just in case it doesn't exist */
 			if (directory) {
@@ -162,7 +162,7 @@ int ast_monitor_start(	struct ast_channel *chan, const char *format_spec,
 		monitor->stop = ast_monitor_stop;
 
 		/* Determine file format */
-		if (format_spec && !ast_strlen_zero(format_spec)) {
+		if (!ast_strlen_zero(format_spec)) {
 			monitor->format = strdup(format_spec);
 		} else {
 			monitor->format = strdup("wav");
@@ -264,12 +264,12 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock)
 
 			/* Set the execute application */
 			execute = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC");
-			if (!execute || ast_strlen_zero(execute)) { 
+			if (ast_strlen_zero(execute)) { 
 				execute = "nice -n 19 soxmix";
 				delfiles = 1;
 			} 
 			execute_args = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC_ARGS");
-			if (!execute_args || ast_strlen_zero(execute_args)) {
+			if (ast_strlen_zero(execute_args)) {
 				execute_args = "";
 			}
 			
@@ -297,7 +297,7 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock)
 int ast_monitor_change_fname(struct ast_channel *chan, const char *fname_base, int need_lock)
 {
 	char tmp[256];
-	if ((!fname_base) || (ast_strlen_zero(fname_base))) {
+	if (ast_strlen_zero(fname_base)) {
 		ast_log(LOG_WARNING, "Cannot change monitor filename of channel %s to null", chan->name);
 		return -1;
 	}
@@ -344,7 +344,7 @@ static int start_monitor_exec(struct ast_channel *chan, void *data)
 	int res = 0;
 	
 	/* Parse arguments. */
-	if (data && !ast_strlen_zero((char*)data)) {
+	if (!ast_strlen_zero((char*)data)) {
 		arg = ast_strdupa((char*)data);
 		format = arg;
 		fname_base = strchr(arg, '|');
@@ -433,7 +433,7 @@ static int start_monitor_action(struct mansession *s, struct message *m)
 	char *mix = astman_get_header(m, "Mix");
 	char *d;
 	
-	if ((!name) || (ast_strlen_zero(name))) {
+	if (ast_strlen_zero(name)) {
 		astman_send_error(s, m, "No channel specified");
 		return 0;
 	}
@@ -443,7 +443,7 @@ static int start_monitor_action(struct mansession *s, struct message *m)
 		return 0;
 	}
 
-	if ((!fname) || (ast_strlen_zero(fname))) {
+	if (ast_strlen_zero(fname)) {
 		/* No filename base specified, default to channel name as per CLI */
 		fname = malloc (FILENAME_MAX);
 		if (!fname) {
@@ -484,7 +484,7 @@ static int stop_monitor_action(struct mansession *s, struct message *m)
 	struct ast_channel *c = NULL;
 	char *name = astman_get_header(m, "Channel");
 	int res;
-	if ((!name) || (ast_strlen_zero(name))) {
+	if (ast_strlen_zero(name)) {
 		astman_send_error(s, m, "No channel specified");
 		return 0;
 	}
@@ -516,11 +516,11 @@ static int change_monitor_action(struct mansession *s, struct message *m)
 	struct ast_channel *c = NULL;
 	char *name = astman_get_header(m, "Channel");
 	char *fname = astman_get_header(m, "File");
-	if ((!name) || (ast_strlen_zero(name))) {
+	if (ast_strlen_zero(name)) {
 		astman_send_error(s, m, "No channel specified");
 		return 0;
 	}
-	if ((!fname)||(ast_strlen_zero(fname))) {
+	if (ast_strlen_zero(fname)) {
 		astman_send_error(s, m, "No filename specified");
 		return 0;
 	}
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index e029265dd..2939659dc 100755
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -361,7 +361,7 @@ static int spawn_mp3(struct mohclass *class)
 		/* Look for extra arguments and add them to the list */
 		strncpy(xargs, class->args, sizeof(xargs) - 1);
 		argptr = xargs;
-		while (argptr && !ast_strlen_zero(argptr)) {
+		while (!ast_strlen_zero(argptr)) {
 			argv[argc++] = argptr;
 			argptr = strchr(argptr, ',');
 			if (argptr) {
@@ -373,7 +373,7 @@ static int spawn_mp3(struct mohclass *class)
 		/* Format arguments for argv vector */
 		strncpy(xargs, class->args, sizeof(xargs) - 1);
 		argptr = xargs;
-		while (argptr && !ast_strlen_zero(argptr)) {
+		while (!ast_strlen_zero(argptr)) {
 			argv[argc++] = argptr;
 			argptr = strchr(argptr, ' ');
 			if (argptr) {
@@ -569,7 +569,7 @@ static int moh1_exec(struct ast_channel *chan, void *data)
 
 static int moh2_exec(struct ast_channel *chan, void *data)
 {
-	if (!data || ast_strlen_zero(data)) {
+	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "SetMusicOnHold requires an argument (class)\n");
 		return -1;
 	}
@@ -865,9 +865,9 @@ static int local_ast_moh_start(struct ast_channel *chan, char *class)
 {
 	struct mohclass *mohclass;
 
-	if (!class || ast_strlen_zero(class))
+	if (ast_strlen_zero(class))
 		class = chan->musicclass;
-	if (!class || ast_strlen_zero(class))
+	if (ast_strlen_zero(class))
 		class = "default";
 	ast_mutex_lock(&moh_lock);
 	mohclass = get_mohbyname(class);