aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-03 18:10:44 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-11-03 18:10:44 +0000
commitffd2ffe51c1ee2be76b2aaac37dfb3c5315fdb43 (patch)
treeca60fe91e27a2c890aad30aa8d94d701567653b1 /res
parentc014a134dfcc1276c5b0c4ef8c42ef5cef6fe495 (diff)
move variable declarations to the beginning of a block.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47128 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_jabber.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 16cc66746..fcf145659 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -539,11 +539,12 @@ static int aji_act_hook(void *data, int type, iks *node)
iks *x = NULL;
x = iks_new("auth");
if (x) {
- iks_insert_attrib(x, "xmlns", IKS_NS_XMPP_SASL);
int len = strlen(client->jid->user) + strlen(client->password) + 3;
/* XXX Check return values XXX */
char *s = ast_malloc(80 + len);
char *base64 = ast_malloc(80 + len * 2);
+
+ iks_insert_attrib(x, "xmlns", IKS_NS_XMPP_SASL);
iks_insert_attrib(x, "mechanism", "PLAIN");
sprintf(s, "%c%s%c%s", 0, client->jid->user, 0, client->password);
ast_base64encode(base64, (const unsigned char *) s, len, len * 2);
@@ -708,8 +709,9 @@ static int aji_register_query_handler(void *data, ikspak *pak)
buddy = ASTOBJ_CONTAINER_FIND(&client->buddies, pak->from->partial);
if (!buddy) {
- ast_verbose("Someone.... %s tried to register but they aren't allowed\n", pak->from->partial);
iks *iq = NULL, *query = NULL, *error = NULL, *notacceptable = NULL;
+
+ ast_verbose("Someone.... %s tried to register but they aren't allowed\n", pak->from->partial);
iq = iks_new("iq");
query = iks_new("query");
error = iks_new("error");