Changeset b8c336b for lib/oauth.c

Timestamp:

2015-05-09T19:50:30Z (10 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

File:

• lib/oauth.c (modified) (2 diffs)

lib/oauth.c

@@ -96 +96 @@
 {
         int key_len = strlen(key);
-        GSList *l;
+        GSList *l, *n;
 
         if (!params) {
@@ -102 +102 @@
         }
 
-        for (l = *params; l; l = l->next) {
+        for (l = *params; l; l = n) {
+                n = l->next;
                 char *data = l->data;