From: Kinsey Moore <kmoore@digium.com>
Date: Mon, 11 Jun 2012 15:13:22 +0000 (+0000)
Subject: Fix coverity UNUSED_VALUE findings in core support level files
X-Git-Tag: 1.8.15.0-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0353a576713e0cef983dc149cb7609dc3ffc019c;p=thirdparty%2Fasterisk.git

Fix coverity UNUSED_VALUE findings in core support level files

Most of these were just saving returned values without using them and
in some cases the variable being saved to could be removed as well.

(issue ASTERISK-19672)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@368738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_directory.c b/apps/app_directory.c
index dccae948b9..ac2acedece 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -475,7 +475,8 @@ static struct ast_config *realtime_directory(char *context)
 		const char *context = ast_variable_retrieve(rtdata, mailbox, "context");
 
 		fullname = ast_variable_retrieve(rtdata, mailbox, "fullname");
-		if (ast_true((hidefromdir = ast_variable_retrieve(rtdata, mailbox, "hidefromdir")))) {
+		hidefromdir = ast_variable_retrieve(rtdata, mailbox, "hidefromdir");
+		if (ast_true(hidefromdir)) {
 			/* Skip hidden */
 			continue;
 		}
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 62577aca71..34703f1478 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2281,7 +2281,7 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
 	memset(tmpbuf, 0, sizeof(tmpbuf));
 	for (v = queue_vars; v; v = v->next) {
 		/* Convert to dashes `-' from underscores `_' as the latter are more SQL friendly. */
-		if ((tmp = strchr(v->name, '_'))) {
+		if (strchr(v->name, '_')) {
 			ast_copy_string(tmpbuf, v->name, sizeof(tmpbuf));
 			tmp_name = tmpbuf;
 			tmp = tmpbuf;
@@ -4814,10 +4814,10 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 		/* Begin Monitoring */
 		if (qe->parent->monfmt && *qe->parent->monfmt) {
 			if (!qe->parent->montype) {
-				const char *monexec, *monargs;
+				const char *monexec;
 				ast_debug(1, "Starting Monitor as requested.\n");
 				ast_channel_lock(qe->chan);
-				if ((monexec = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC")) || (monargs = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC_ARGS"))) {
+				if ((monexec = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC")) || pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC_ARGS")) {
 					which = qe->chan;
 					monexec = monexec ? ast_strdupa(monexec) : NULL;
 				}
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 2a633264ed..96adc2fa60 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1581,7 +1581,7 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword)
 			for (category = ast_category_browse(cfg, NULL); category; category = ast_category_browse(cfg, category)) {
 				ast_debug(4, "users.conf: %s\n", category);
 				if (!strcasecmp(category, vmu->mailbox)) {
-					if (!(tmp = ast_variable_retrieve(cfg, category, "vmsecret"))) {
+					if (!ast_variable_retrieve(cfg, category, "vmsecret")) {
 						ast_debug(3, "looks like we need to make vmsecret!\n");
 						var = ast_variable_new("vmsecret", newpassword, "");
 					} else {
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 45ae9cdf91..e31347dd2e 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -14351,14 +14351,13 @@ static char *handle_pri_service_generic(struct ast_cli_entry *e, int cmd, struct
 	int trunkgroup;
 	int x, y, fd = a->fd;
 	int interfaceid = 0;
-	char *c;
 	char db_chan_name[20], db_answer[5];
 	struct dahdi_pvt *tmp;
 	struct dahdi_pri *pri;
 
 	if (a->argc < 5 || a->argc > 6)
 		return CLI_SHOWUSAGE;
-	if ((c = strchr(a->argv[4], ':'))) {
+	if (strchr(a->argv[4], ':')) {
 		if (sscanf(a->argv[4], "%30d:%30d", &trunkgroup, &channel) != 2)
 			return CLI_SHOWUSAGE;
 		if ((trunkgroup < 1) || (channel < 1))
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 31118ceb73..e49deb1c23 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13549,7 +13549,7 @@ static int transmit_refer(struct sip_pvt *p, const char *dest)
 		ast_log(LOG_NOTICE, "From address missing 'sip(s):', assuming sip:\n");
 	}
 	/* Get just the username part */
-	if ((c = strchr(dest, '@'))) {
+	if (strchr(dest, '@')) {
 		c = NULL;
 	} else if ((c = strchr(of, '@'))) {
 		*c++ = '\0';
diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c
index 7454d699bb..7138de4bf4 100644
--- a/channels/sip/dialplan_functions.c
+++ b/channels/sip/dialplan_functions.c
@@ -153,9 +153,9 @@ int sip_acf_channel_read(struct ast_channel *chan, const char *funcname, char *p
 		}
 
 		if (ast_strlen_zero(args.field) || !strcasecmp(args.field, "all")) {
-			char quality_buf[AST_MAX_USER_FIELD], *quality;
+			char quality_buf[AST_MAX_USER_FIELD];
 
-			if (!(quality = ast_rtp_instance_get_quality(rtp, AST_RTP_INSTANCE_STAT_FIELD_QUALITY, quality_buf, sizeof(quality_buf)))) {
+			if (!ast_rtp_instance_get_quality(rtp, AST_RTP_INSTANCE_STAT_FIELD_QUALITY, quality_buf, sizeof(quality_buf))) {
 				return -1;
 			}
 
diff --git a/channels/sip/reqresp_parser.c b/channels/sip/reqresp_parser.c
index 43e670a886..6cd3d6a9e3 100644
--- a/channels/sip/reqresp_parser.c
+++ b/channels/sip/reqresp_parser.c
@@ -1079,7 +1079,7 @@ AST_TEST_DEFINE(get_in_brackets_test)
 	}
 
 	/* Test 6, NULL input  */
-	if ((uri = get_in_brackets(NULL))) {
+	if (get_in_brackets(NULL)) {
 		ast_test_status_update(test, "Test 6, NULL input failed.\n");
 		res = AST_TEST_FAIL;
 	}
diff --git a/channels/sip/sdp_crypto.c b/channels/sip/sdp_crypto.c
index d78515ad16..fa0419e01f 100644
--- a/channels/sip/sdp_crypto.c
+++ b/channels/sip/sdp_crypto.c
@@ -51,9 +51,7 @@ static int set_crypto_policy(struct ast_srtp_policy *policy, int suite_val, cons
 
 static struct sdp_crypto *sdp_crypto_alloc(void)
 {
-	struct sdp_crypto *crypto;
-
-	return crypto = ast_calloc(1, sizeof(*crypto));
+	return ast_calloc(1, sizeof(struct sdp_crypto));
 }
 
 void sdp_crypto_destroy(struct sdp_crypto *crypto)
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 7a8223ad77..2157b8cc29 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -566,7 +566,6 @@ static int listfilter(struct ast_channel *chan, const char *cmd, char *parse, ch
 		AST_APP_ARG(delimiter);
 		AST_APP_ARG(fieldvalue);
 	);
-	const char *ptr;
 	struct ast_str *orig_list = ast_str_thread_get(&tmp_buf, 16);
 	const char *begin, *cur, *next;
 	int dlen, flen, first = 1;
@@ -606,7 +605,7 @@ static int listfilter(struct ast_channel *chan, const char *cmd, char *parse, ch
 	}
 
 	/* If the string isn't there, just copy out the string and be done with it. */
-	if (!(ptr = strstr(ast_str_buffer(orig_list), args.fieldvalue))) {
+	if (!strstr(ast_str_buffer(orig_list), args.fieldvalue)) {
 		if (buf) {
 			ast_copy_string(buf, ast_str_buffer(orig_list), len);
 		} else {
diff --git a/main/loader.c b/main/loader.c
index 06f59cb6c8..ba66fed6f6 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -1066,13 +1066,13 @@ int load_modules(unsigned int preload_only)
 			if (mod->flags.running)
 				continue;
 
-			order = add_to_load_order(mod->resource, &load_order, 0);
+			add_to_load_order(mod->resource, &load_order, 0);
 		}
 
 #ifdef LOADABLE_MODULES
 		/* if we are allowed to load dynamic modules, scan the directory for
 		   for all available modules and add them as well */
-		if ((dir  = opendir(ast_config_AST_MODULE_DIR))) {
+		if ((dir = opendir(ast_config_AST_MODULE_DIR))) {
 			while ((dirent = readdir(dir))) {
 				int ld = strlen(dirent->d_name);
 
diff --git a/main/say.c b/main/say.c
index e1580a3c11..77047223af 100644
--- a/main/say.c
+++ b/main/say.c
@@ -1907,7 +1907,7 @@ static void powiedz(struct ast_channel *chan, const char *language, int audiofd,
 			char *b = buf;
 			b = pl_append(b, odm->dziesiatki[m100 / 10]);  
 			b = pl_append(b, odm->separator_dziesiatek);  
-			b = pl_append(b, odm->cyfry2[m100 % 10]); 
+			pl_append(b, odm->cyfry2[m100 % 10]); 
 			pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, buf);
 		}
 	} 
diff --git a/main/udptl.c b/main/udptl.c
index f2cc49422a..8cdf9147d8 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -1355,10 +1355,10 @@ static void __ast_udptl_reload(int reload)
 				ast_log(LOG_WARNING, "Disabling UDPTL checksums is not supported on this operating system!\n");
 #endif
 		}
-		if ((s = ast_variable_retrieve(cfg, "general", "T38FaxUdpEC"))) {
+		if (ast_variable_retrieve(cfg, "general", "T38FaxUdpEC")) {
 			ast_log(LOG_WARNING, "T38FaxUdpEC in udptl.conf is no longer supported; use the t38pt_udptl configuration option in sip.conf instead.\n");
 		}
-		if ((s = ast_variable_retrieve(cfg, "general", "T38FaxMaxDatagram"))) {
+		if (ast_variable_retrieve(cfg, "general", "T38FaxMaxDatagram")) {
 			ast_log(LOG_WARNING, "T38FaxMaxDatagram in udptl.conf is no longer supported; value is now supplied by T.38 applications.\n");
 		}
 		if ((s = ast_variable_retrieve(cfg, "general", "UDPTLFECEntries"))) {
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 76d14ac47c..305fe8e3b9 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1467,7 +1467,7 @@ static int pbx_load_config(const char *config_file)
 				}
 			} else if (!strcasecmp(v->name, "exten")) {
 				int ipri;
-				char *plus, *firstp;
+				char *plus;
 				char *pri, *appl, *data, *cidmatch;
 
 				if (!(stringp = tc = ast_strdup(v->value))) {
@@ -1537,7 +1537,7 @@ process_extension:
 				}
 				appl = S_OR(stringp, "");
 				/* Find the first occurrence of '(' */
-				if (!(firstp = strchr(appl, '('))) {
+				if (!strchr(appl, '(')) {
 					/* No arguments */
 					data = "";
 				} else {
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 46922835fd..66e15a02be 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -518,7 +518,7 @@ static int update_odbc(const char *database, const char *table, const char *keyf
 	}
 	va_arg(aq, const char *);
 
-	if (tableptr && !(column = ast_odbc_find_column(tableptr, newparam))) {
+	if (tableptr && !ast_odbc_find_column(tableptr, newparam)) {
 		ast_log(LOG_WARNING, "Key field '%s' does not exist in table '%s@%s'.  Update will fail\n", newparam, table, database);
 	}
 
@@ -587,7 +587,6 @@ static SQLHSTMT update2_prepare(struct odbc_obj *obj, void *data)
 	SQLHSTMT stmt;
 	va_list ap;
 	struct odbc_cache_tables *tableptr = ast_odbc_find_table(ups->database, ups->table);
-	struct odbc_cache_columns *column;
 
 	if (!sql) {
 		if (tableptr) {
@@ -619,7 +618,7 @@ static SQLHSTMT update2_prepare(struct odbc_obj *obj, void *data)
 
 	while ((newparam = va_arg(ap, const char *))) {
 		newval = va_arg(ap, const char *);
-		if ((column = ast_odbc_find_column(tableptr, newparam))) {
+		if (ast_odbc_find_column(tableptr, newparam)) {
 			ast_str_append(&sql, 0, "%s%s=? ", first ? "" : ", ", newparam);
 			SQLBindParameter(stmt, x++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(newval), 0, (void *)newval, 0, NULL);
 			first = 0;
@@ -637,7 +636,7 @@ static SQLHSTMT update2_prepare(struct odbc_obj *obj, void *data)
 
 	while ((newparam = va_arg(ap, const char *))) {
 		newval = va_arg(ap, const char *);
-		if (!(column = ast_odbc_find_column(tableptr, newparam))) {
+		if (!ast_odbc_find_column(tableptr, newparam)) {
 			va_end(ap);
 			ast_log(LOG_ERROR, "One or more of the criteria columns '%s' on '%s@%s' for this update does not exist!\n", newparam, ups->table, ups->database);
 			ast_odbc_release_table(tableptr);
diff --git a/res/res_fax.c b/res/res_fax.c
index fbbe650ea5..93d92d2223 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -462,7 +462,7 @@ static int update_modem_bits(enum ast_fax_modems *bits, const char *value)
 	char *m[5], *tok, *v = (char *)value;
 	int i = 0, j;
 
-	if (!(tok = strchr(v, ','))) {
+	if (!strchr(v, ',')) {
 		m[i++] = v;
 		m[i] = NULL;
 	} else {
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 7787420267..c51eaac43a 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -1632,7 +1632,7 @@ static int acf_transaction_write(struct ast_channel *chan, const char *cmd, char
 				pbx_builtin_setvar_helper(chan, "ODBC_RESULT", "INVALID_DB");
 				return -1;
 			}
-			if (!(tx = find_transaction(chan, obj, value, 0))) {
+			if (!find_transaction(chan, obj, value, 0)) {
 				pbx_builtin_setvar_helper(chan, "ODBC_RESULT", "FAILED_TO_CREATE");
 				return -1;
 			}
diff --git a/res/res_speech.c b/res/res_speech.c
index 9b043190be..ad8bf81cea 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -271,7 +271,6 @@ int ast_speech_change_results_type(struct ast_speech *speech, enum ast_speech_re
 /*! \brief Register a speech recognition engine */
 int ast_speech_register(struct ast_speech_engine *engine)
 {
-	struct ast_speech_engine *existing_engine = NULL;
 	int res = 0;
 
 	/* Confirm the engine meets the minimum API requirements */
@@ -281,7 +280,7 @@ int ast_speech_register(struct ast_speech_engine *engine)
 	}
 
 	/* If an engine is already loaded with this name, error out */
-	if ((existing_engine = find_engine(engine->name))) {
+	if (find_engine(engine->name)) {
 		ast_log(LOG_WARNING, "Speech recognition engine '%s' already exists.\n", engine->name);
 		return -1;
 	}