Changeset 7a9d968 for protocols/oscar/rxhandlers.c

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (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 'master' into HEAD

File:

• protocols/oscar/rxhandlers.c (modified) (1 diff)

protocols/oscar/rxhandlers.c

@@ -235 +235 @@
         struct aim_rxcblist_s *newcb;
 
-        if (!conn) {
-                return -1;
-        }
-
-        if (checkdisallowed(family, type)) {
-                g_assert(0);
-                return -1;
-        }
+        g_return_val_if_fail(conn, -1);
+        g_return_val_if_fail(!checkdisallowed(family, type), -1);
 
         if (!(newcb = (struct aim_rxcblist_s *) g_new0(struct aim_rxcblist_s, 1))) {