Commit the remainder of r398523

This is a missing part of the commit in revision 398523 that corrects
the name of a variable.

(issue ASTERISK-22435)
........

Merged revisions 398576 from http://svn.asterisk.org/svn/asterisk/branches/1.8

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

diff --git a/res/res_jabber.c b/res/res_jabber.c
index 1c7a2349efb072e332691599ef107c0bedb6d5e3..b7c62cbb2c70b36df006e09272334b172278ce26 100644 (file)
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -3319,7 +3319,7 @@ static void aji_init_event_distribution(struct aji_client *client)
  */
 static int aji_handle_pubsub_event(void *data, ikspak *pak)
 {
-       char *item_id, *device_state, *context, *cachable_str;
+       char *item_id, *device_state, *mailbox, *cachable_str;
        int oldmsgs, newmsgs;
        iks *item, *item_content;
        struct ast_eid pubsub_eid;
@@ -3352,15 +3352,16 @@ static int aji_handle_pubsub_event(void *data, ikspak *pak)
                        return IKS_FILTER_EAT;
                }
        } else if (!strcasecmp(iks_name(item_content), "mailbox")) {
-               context = strsep(&item_id, "@");
+               mailbox = strsep(&item_id, "@");
                sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
                sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
-               if (!(event = ast_event_new(AST_EVENT_MWI, AST_EVENT_IE_MAILBOX,
-                       AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_CONTEXT,
-                       AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_OLDMSGS,
-                       AST_EVENT_IE_PLTYPE_UINT, oldmsgs, AST_EVENT_IE_NEWMSGS,
-                       AST_EVENT_IE_PLTYPE_UINT, newmsgs, AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW,
-                       &pubsub_eid, sizeof(pubsub_eid), AST_EVENT_IE_END))) {
+               if (!(event = ast_event_new(AST_EVENT_MWI,
+                       AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, mailbox,
+                       AST_EVENT_IE_CONTEXT, AST_EVENT_IE_PLTYPE_STR, item_id,
+                       AST_EVENT_IE_OLDMSGS, AST_EVENT_IE_PLTYPE_UINT, oldmsgs,
+                       AST_EVENT_IE_NEWMSGS, AST_EVENT_IE_PLTYPE_UINT, newmsgs,
+                       AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW, &pubsub_eid, sizeof(pubsub_eid),
+                       AST_EVENT_IE_END))) {
                        return IKS_FILTER_EAT;
                }
        } else {

diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 30e2c4059a7dc5dbf4a1446d057f204946f297d8..0589e86bc9be4136fc10f0373a977079177db338 100644 (file)
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -1309,7 +1309,7 @@ static void xmpp_pubsub_subscribe(struct ast_xmpp_client *client, const char *no
  */
 static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
 {
-       char *item_id, *device_state, *context, *cachable_str;
+       char *item_id, *device_state, *mailbox, *cachable_str;
        int oldmsgs, newmsgs;
        iks *item, *item_content;
        struct ast_eid pubsub_eid;
@@ -1341,15 +1341,16 @@ static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
                        return IKS_FILTER_EAT;
                }
        } else if (!strcasecmp(iks_name(item_content), "mailbox")) {
-               context = strsep(&item_id, "@");
+               mailbox = strsep(&item_id, "@");
                sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
                sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
-               if (!(event = ast_event_new(AST_EVENT_MWI, AST_EVENT_IE_MAILBOX,
-                                           AST_EVENT_IE_PLTYPE_STR, context, AST_EVENT_IE_CONTEXT,
-                                           AST_EVENT_IE_PLTYPE_STR, item_id, AST_EVENT_IE_OLDMSGS,
-                                           AST_EVENT_IE_PLTYPE_UINT, oldmsgs, AST_EVENT_IE_NEWMSGS,
-                                           AST_EVENT_IE_PLTYPE_UINT, newmsgs, AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW,
-                                           &pubsub_eid, sizeof(pubsub_eid), AST_EVENT_IE_END))) {
+               if (!(event = ast_event_new(AST_EVENT_MWI,
+                       AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, mailbox,
+                       AST_EVENT_IE_CONTEXT, AST_EVENT_IE_PLTYPE_STR, item_id,
+                       AST_EVENT_IE_OLDMSGS, AST_EVENT_IE_PLTYPE_UINT, oldmsgs,
+                       AST_EVENT_IE_NEWMSGS, AST_EVENT_IE_PLTYPE_UINT, newmsgs,
+                       AST_EVENT_IE_EID, AST_EVENT_IE_PLTYPE_RAW, &pubsub_eid, sizeof(pubsub_eid),
+                       AST_EVENT_IE_END))) {
                        return IKS_FILTER_EAT;
                }
        } else {