Changeset d57484d

Timestamp:

2016-12-26T22:39:18Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

a04705b

Parents:

90a45b8

Message:

Change some asserts into g_return_if_fail()

Because crashing asserts are bad, and maybe this helps fix the
captures_build_path issue with debian's reproducible builds
(those asserts probably include FILE)

Files:

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

otr.c

@@ -1514 +1514 @@
                         }
                 }
-                assert(l != NULL);  /* a match should always be found */
+                g_return_val_if_fail(l, NULL);
                 if (!l) {
                         return NULL;

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))) {

protocols/purple/purple.c

@@ -1690 +1690 @@
         }
 
-        g_assert((int) B_EV_IO_READ == (int) PURPLE_INPUT_READ);
-        g_assert((int) B_EV_IO_WRITE == (int) PURPLE_INPUT_WRITE);
+        g_return_if_fail((int) B_EV_IO_READ == (int) PURPLE_INPUT_READ);
+        g_return_if_fail((int) B_EV_IO_WRITE == (int) PURPLE_INPUT_WRITE);
 
         dir = g_strdup_printf("%s/purple", global.conf->configdir);