From b0778107c7cf24642c8ca2778420eef7dfeca6b6 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 3 Nov 2009 22:08:46 +0000 Subject: [PATCH] Resolve a warning from gcc 4.4.1. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@227463 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 4 +++- pbx/pbx_config.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main/manager.c b/main/manager.c index 17f487fe2d..a5fc427594 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1143,10 +1143,12 @@ static struct ast_manager_user *get_manager_by_name_locked(const char *name) { struct ast_manager_user *user = NULL; - AST_RWLIST_TRAVERSE(&users, user, list) + AST_RWLIST_TRAVERSE(&users, user, list) { if (!strcasecmp(user->username, name)) { break; } + } + return user; } diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 69291aa092..a14ad694cd 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -38,8 +38,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" /* AST_MAX_EXTENSION */ #include "asterisk/callerid.h" -static char *config = "extensions.conf"; -static char *registrar = "pbx_config"; +static const char config[] = "extensions.conf"; +static const char registrar[] = "pbx_config"; static char userscontext[AST_MAX_EXTENSION] = "default"; static int static_config = 0;