Avoid cppcheck warnings; removing unused vars and a bit of cleanup.

Patch by: junky
Review: https://reviewboard.asterisk.org/r/1743/


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

10 files changed, 29 insertions, 28 deletions

diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index 554f4f5d4..159d2ab80 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -1092,11 +1092,6 @@ static struct ast_config *config_ldap(const char *basedn, const char *table_name
 		struct ast_variable *var_metric = variable_named(*p, "var_metric");
 		struct ast_variable *dn = variable_named(*p, "dn");
 
-		ast_debug(3, "category: %s\n", category->value);
-		ast_debug(3, "var_name: %s\n", var_name->value);
-		ast_debug(3, "var_val: %s\n", var_val->value);
-		ast_debug(3, "cat_metric: %s\n", cat_metric->value);
-
 		if (!category) {
 			ast_log(LOG_ERROR, "No category name in entry '%s'  for file '%s'.\n",
 					(dn ? dn->value : "?"), file);
@@ -1122,6 +1117,12 @@ static struct ast_config *config_ldap(const char *basedn, const char *table_name
 			categories[vars_count].var_metric = atoi(var_metric->value);
 			vars_count++;
 		}
+
+		ast_debug(3, "category: %s\n", category->value);
+		ast_debug(3, "var_name: %s\n", var_name->value);
+		ast_debug(3, "var_val: %s\n", var_val->value);
+		ast_debug(3, "cat_metric: %s\n", cat_metric->value);
+
 	}
 
 	qsort(categories, vars_count, sizeof(*categories), compare_categories);
diff --git a/res/res_config_sqlite3.c b/res/res_config_sqlite3.c
index 7e5b2e9f8..17b641dfb 100644
--- a/res/res_config_sqlite3.c
+++ b/res/res_config_sqlite3.c
@@ -961,7 +961,7 @@ static int handle_missing_column(struct realtime_sqlite3_db *db, const char *tab
 		return -1;
 	}
 
-	if (!(res = realtime_sqlite3_execute_handle(db, sql, NULL, NULL, 1) < 0 ? -1 : 0)) {
+	if (!(res = (realtime_sqlite3_execute_handle(db, sql, NULL, NULL, 1) < 0 ? -1 : 0))) {
 		ast_log(LOG_NOTICE, "Creating column '%s' type %s for table %s\n", column, sqltype, table);
 	}
 
diff --git a/res/res_corosync.c b/res/res_corosync.c
index 9ce44103d..d1c95f9ec 100644
--- a/res/res_corosync.c
+++ b/res/res_corosync.c
@@ -497,12 +497,12 @@ static void cleanup_module(void)
 		dispatch_thread.alert_pipe[1] = -1;
 	}
 
-	if (cpg_handle && (cs_err = cpg_finalize(cpg_handle) != CS_OK)) {
+	if (cpg_handle && (cs_err = cpg_finalize(cpg_handle)) != CS_OK) {
 		ast_log(LOG_ERROR, "Failed to finalize cpg (%d)\n", (int) cs_err);
 	}
 	cpg_handle = 0;
 
-	if (cfg_handle && (cs_err = corosync_cfg_finalize(cfg_handle) != CS_OK)) {
+	if (cfg_handle && (cs_err = corosync_cfg_finalize(cfg_handle)) != CS_OK) {
 		ast_log(LOG_ERROR, "Failed to finalize cfg (%d)\n", (int) cs_err);
 	}
 	cfg_handle = 0;
@@ -514,12 +514,12 @@ static int load_module(void)
 	enum ast_module_load_result res = AST_MODULE_LOAD_FAILURE;
 	struct cpg_name name;
 
-	if ((cs_err = corosync_cfg_initialize(&cfg_handle, &cfg_callbacks) != CS_OK)) {
+	if ((cs_err = corosync_cfg_initialize(&cfg_handle, &cfg_callbacks)) != CS_OK) {
 		ast_log(LOG_ERROR, "Failed to initialize cfg (%d)\n", (int) cs_err);
 		return AST_MODULE_LOAD_DECLINE;
 	}
 
-	if ((cs_err = cpg_initialize(&cpg_handle, &cpg_callbacks) != CS_OK)) {
+	if ((cs_err = cpg_initialize(&cpg_handle, &cpg_callbacks)) != CS_OK) {
 		ast_log(LOG_ERROR, "Failed to initialize cpg (%d)\n", (int) cs_err);
 		goto failed;
 	}
diff --git a/res/res_format_attr_celt.c b/res/res_format_attr_celt.c
index 821b0bf3e..bd38b29e2 100644
--- a/res/res_format_attr_celt.c
+++ b/res/res_format_attr_celt.c
@@ -72,8 +72,8 @@ static int celt_get_val(const struct ast_format_attr *fattr, int key, void *resu
 		*val = attr->framesize;
 		break;
 	default:
-		return -1;
 		ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+		return -1;
 	}
 	return 0;
 }
@@ -104,8 +104,8 @@ static int celt_isset(const struct ast_format_attr *fattr, va_list ap)
 			}
 			break;
 		default:
-			return -1;
 			ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+			return -1;
 		}
 	}
 	return 0;
diff --git a/res/res_format_attr_silk.c b/res/res_format_attr_silk.c
index 2d3c91b86..4f9bae739 100644
--- a/res/res_format_attr_silk.c
+++ b/res/res_format_attr_silk.c
@@ -80,8 +80,8 @@ static int silk_get_val(const struct ast_format_attr *fattr, int key, void *resu
 		*val = attr->packetloss_percentage;
 		break;
 	default:
-		return -1;
 		ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+		return -1;
 	}
 	return 0;
 }
@@ -122,8 +122,8 @@ static int silk_isset(const struct ast_format_attr *fattr, va_list ap)
 			}
 			break;
 		default:
-			return -1;
 			ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
+			return -1;
 		}
 	}
 	return 0;
diff --git a/res/res_http_post.c b/res/res_http_post.c
index 3dde6484d..c05c228e1 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -319,7 +319,6 @@ static int http_post_callback(struct ast_tcptls_session_instance *ser, const str
 	int content_len = 0;
 	struct ast_str *post_dir;
 	GMimeMessage *message;
-	int message_count = 0;
 	char * boundary_marker = NULL;
 
 	if (method != AST_HTTP_POST) {
@@ -409,7 +408,7 @@ static int http_post_callback(struct ast_tcptls_session_instance *ser, const str
 		return -1;
 	}
 
-	if (!(message_count = process_message(message, ast_str_buffer(post_dir)))) {
+	if (!process_message(message, ast_str_buffer(post_dir))) {
 		ast_log(LOG_ERROR, "Invalid MIME data, found no parts!\n");
 		g_object_unref(message);
 		ast_http_error(ser, 400, "Bad Request", "The was an error parsing the request.");
diff --git a/res/res_jabber.c b/res/res_jabber.c
index b808e51ba..a68864f22 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -1282,7 +1282,6 @@ static int aji_start_tls(struct aji_client *client)
  */
 static int aji_tls_handshake(struct aji_client *client)
 {
-	int ret;
 	int sock;
 
 	ast_debug(1, "Starting TLS handshake\n");
@@ -1300,12 +1299,12 @@ static int aji_tls_handshake(struct aji_client *client)
 
 	/* Enforce TLS on our XMPP connection */
 	sock = iks_fd(client->p);
-	if (!(ret = SSL_set_fd(client->ssl_session, sock))) {
+	if (!SSL_set_fd(client->ssl_session, sock)) {
 		return IKS_NET_TLSFAIL;
 	}
 
 	/* Perform SSL handshake */
-	if (!(ret = SSL_connect(client->ssl_session))) {
+	if (!SSL_connect(client->ssl_session)) {
 		return IKS_NET_TLSFAIL;
 	}
 
@@ -1313,7 +1312,7 @@ static int aji_tls_handshake(struct aji_client *client)
 	client->stream_flags |= SECURE;
 
 	/* Sent over the established TLS connection */
-	if ((ret = aji_send_header(client, client->jid->server)) != IKS_OK) {
+	if (aji_send_header(client, client->jid->server) != IKS_OK) {
 		return IKS_NET_TLSFAIL;
 	}
 
@@ -1661,8 +1660,8 @@ static int aji_act_hook(void *data, int type, iks *node)
 					ASTOBJ_UNREF(client, ast_aji_client_destroy);
 					return IKS_HOOK;
 				}
-#endif
 				break;
+#endif
 			}
 			if (!client->usesasl) {
 				iks_filter_add_rule(client->f, aji_client_connect, client, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_SUBTYPE, IKS_TYPE_RESULT, IKS_RULE_ID, client->mid, IKS_RULE_DONE);
@@ -1877,7 +1876,6 @@ static int aji_register_query_handler(void *data, ikspak *pak)
 {
 	struct aji_client *client = ASTOBJ_REF((struct aji_client *) data);
 	struct aji_buddy *buddy = NULL;
-	char *node = NULL;
 	iks *iq = NULL, *query = NULL;
 
 	client = (struct aji_client *) data;
@@ -1910,7 +1908,7 @@ static int aji_register_query_handler(void *data, ikspak *pak)
 
 		iks_delete(error);
 		iks_delete(notacceptable);
-	} else if (!(node = iks_find_attrib(pak->query, "node"))) {
+	} else if (!iks_find_attrib(pak->query, "node")) {
 		iks *instructions = NULL;
 		char *explain = "Welcome to Asterisk - the Open Source PBX.\n";
 		iq = iks_new("iq");
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 639c3b05f..7d5c96922 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1099,16 +1099,19 @@ static int moh_scan_files(struct mohclass *class) {
 		return -1;
 	}
 
-	for (i = 0; i < class->total_files; i++)
+	for (i = 0; i < class->total_files; i++) {
 		ast_free(class->filearray[i]);
-
+	}
 	class->total_files = 0;
+
 	if (!getcwd(path, sizeof(path))) {
 		ast_log(LOG_WARNING, "getcwd() failed: %s\n", strerror(errno));
+		closedir(files_DIR);
 		return -1;
 	}
 	if (chdir(dir_path) < 0) {
 		ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
+		closedir(files_DIR);
 		return -1;
 	}
 	while ((files_dirent = readdir(files_DIR))) {
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 1a4b77662..5aaff57f1 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -1492,7 +1492,7 @@ static odbc_status odbc_obj_disconnect(struct odbc_obj *obj)
 		}
 	}
 
-	if ((res = SQLFreeHandle(SQL_HANDLE_DBC, con) == SQL_SUCCESS)) {
+	if ((res = SQLFreeHandle(SQL_HANDLE_DBC, con)) == SQL_SUCCESS) {
 		ast_debug(1, "Database handle %p deallocated\n", con);
 	} else {
 		SQLGetDiagRec(SQL_HANDLE_DBC, con, 1, state, &err, msg, 100, &mlen);
@@ -1546,7 +1546,7 @@ static odbc_status odbc_obj_connect(struct odbc_obj *obj)
 		SQLGetDiagRec(SQL_HANDLE_DBC, con, 1, state, &err, msg, 100, &mlen);
 		obj->parent->last_negative_connect = ast_tvnow();
 		ast_log(LOG_WARNING, "res_odbc: Error SQLConnect=%d errno=%d %s\n", res, (int)err, msg);
-		if ((res = SQLFreeHandle(SQL_HANDLE_DBC, con) != SQL_SUCCESS)) {
+		if ((res = SQLFreeHandle(SQL_HANDLE_DBC, con)) != SQL_SUCCESS) {
 			SQLGetDiagRec(SQL_HANDLE_DBC, con, 1, state, &err, msg, 100, &mlen);
 			ast_log(LOG_WARNING, "Unable to deallocate database handle %p? %d errno=%d %s\n", con, res, (int)err, msg);
 		}
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index c6dc009ea..4ae7efe8f 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -1002,7 +1002,7 @@ static int set_config(void)
 			}
 
 			if (!(user = build_user(mac, profile))) {
-				ast_log(LOG_WARNING, "Could not create user for '%s' - skipping\n", user->macaddress);
+				ast_log(LOG_WARNING, "Could not create user for '%s' - skipping\n", mac);
 				continue;
 			}