mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-08 19:08:14 +00:00
move variable declarations to top of function where they belong (bug #4303)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -10023,14 +10023,14 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, int
|
|||||||
struct ast_ha *oldha = NULL;
|
struct ast_ha *oldha = NULL;
|
||||||
char *varname = NULL, *varval = NULL;
|
char *varname = NULL, *varval = NULL;
|
||||||
struct ast_variable *tmpvar = NULL;
|
struct ast_variable *tmpvar = NULL;
|
||||||
|
struct ast_flags userflags = {(0)};
|
||||||
|
struct ast_flags mask = {(0)};
|
||||||
|
|
||||||
|
|
||||||
user = (struct sip_user *)malloc(sizeof(struct sip_user));
|
user = (struct sip_user *)malloc(sizeof(struct sip_user));
|
||||||
if (!user) {
|
if (!user) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
struct ast_flags userflags = {(0)};
|
|
||||||
struct ast_flags mask = {(0)};
|
|
||||||
|
|
||||||
memset(user, 0, sizeof(struct sip_user));
|
memset(user, 0, sizeof(struct sip_user));
|
||||||
suserobjs++;
|
suserobjs++;
|
||||||
ASTOBJ_INIT(user);
|
ASTOBJ_INIT(user);
|
||||||
@@ -10170,6 +10170,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
|
|||||||
time_t regseconds;
|
time_t regseconds;
|
||||||
char *varname = NULL, *varval = NULL;
|
char *varname = NULL, *varval = NULL;
|
||||||
struct ast_variable *tmpvar = NULL;
|
struct ast_variable *tmpvar = NULL;
|
||||||
|
struct ast_flags peerflags = {(0)};
|
||||||
|
struct ast_flags mask = {(0)};
|
||||||
|
|
||||||
|
|
||||||
if (!realtime)
|
if (!realtime)
|
||||||
/* Note we do NOT use find_peer here, to avoid realtime recursion */
|
/* Note we do NOT use find_peer here, to avoid realtime recursion */
|
||||||
@@ -10197,9 +10200,6 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
|
|||||||
if (!peer)
|
if (!peer)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
struct ast_flags peerflags = {(0)};
|
|
||||||
struct ast_flags mask = {(0)};
|
|
||||||
|
|
||||||
peer->lastmsgssent = -1;
|
peer->lastmsgssent = -1;
|
||||||
if (!found) {
|
if (!found) {
|
||||||
if (name)
|
if (name)
|
||||||
|
|||||||
Reference in New Issue
Block a user