From: Kinsey Moore <kmoore@digium.com>
Date: Fri, 6 Sep 2013 18:49:09 +0000 (+0000)
Subject: Fix build warnings
X-Git-Tag: 12.0.0-alpha2~24^2~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a91b9bda2e9f78945151e290310df3f7887831d2;p=thirdparty%2Fasterisk.git

Fix build warnings

When AST_DEVMODE is not defined, ast_asserts are not compiled into the
binary. In some cases, this means variables are not referenced or are
set but unused which causes warnings to show up.

(closes issue ASTERISK-22446)
Reported by: Jason Parker (qwell)



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

diff --git a/main/http.c b/main/http.c
index 5d764b4ced..e687d037cf 100644
--- a/main/http.c
+++ b/main/http.c
@@ -914,7 +914,9 @@ struct ast_http_auth *ast_http_get_auth(struct ast_variable *headers)
 		char decoded[256] = {};
 		char *username;
 		char *password;
+#ifdef AST_DEVMODE
 		int cnt;
+#endif /* AST_DEVMODE */
 
 		if (strcasecmp("Authorization", v->name) != 0) {
 			continue;
@@ -939,7 +941,10 @@ struct ast_http_auth *ast_http_get_auth(struct ast_variable *headers)
 		/* This will truncate "userid:password" lines to
 		 * sizeof(decoded). The array is long enough that this shouldn't
 		 * be a problem */
-		cnt = ast_base64decode((unsigned char*)decoded, base64,
+#ifdef AST_DEVMODE
+		cnt =
+#endif /* AST_DEVMODE */
+		ast_base64decode((unsigned char*)decoded, base64,
 			sizeof(decoded) - 1);
 		ast_assert(cnt < sizeof(decoded));
 
diff --git a/res/stasis/app.c b/res/stasis/app.c
index 8abe0c19c2..ab46be5086 100644
--- a/res/stasis/app.c
+++ b/res/stasis/app.c
@@ -68,7 +68,9 @@ struct app_forwards {
 
 static void forwards_dtor(void *obj)
 {
+#ifdef AST_DEVMODE
 	struct app_forwards *forwards = obj;
+#endif /* AST_DEVMODE */
 
 	ast_assert(forwards->topic_forward == NULL);
 	ast_assert(forwards->topic_cached_forward == NULL);