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
This commit is contained in:
Kinsey Moore
2013-09-06 18:49:09 +00:00
parent 14818e6867
commit a91b9bda2e
2 changed files with 8 additions and 1 deletions

View File

@@ -914,7 +914,9 @@ struct ast_http_auth *ast_http_get_auth(struct ast_variable *headers)
char decoded[256] = {}; char decoded[256] = {};
char *username; char *username;
char *password; char *password;
#ifdef AST_DEVMODE
int cnt; int cnt;
#endif /* AST_DEVMODE */
if (strcasecmp("Authorization", v->name) != 0) { if (strcasecmp("Authorization", v->name) != 0) {
continue; continue;
@@ -939,7 +941,10 @@ struct ast_http_auth *ast_http_get_auth(struct ast_variable *headers)
/* This will truncate "userid:password" lines to /* This will truncate "userid:password" lines to
* sizeof(decoded). The array is long enough that this shouldn't * sizeof(decoded). The array is long enough that this shouldn't
* be a problem */ * 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); sizeof(decoded) - 1);
ast_assert(cnt < sizeof(decoded)); ast_assert(cnt < sizeof(decoded));

View File

@@ -68,7 +68,9 @@ struct app_forwards {
static void forwards_dtor(void *obj) static void forwards_dtor(void *obj)
{ {
#ifdef AST_DEVMODE
struct app_forwards *forwards = obj; struct app_forwards *forwards = obj;
#endif /* AST_DEVMODE */
ast_assert(forwards->topic_forward == NULL); ast_assert(forwards->topic_forward == NULL);
ast_assert(forwards->topic_cached_forward == NULL); ast_assert(forwards->topic_cached_forward == NULL);