Changeset 109eb89

Timestamp:

Apr 5, 2013, 3:29:00 PM (11 years ago)

Author:

David Benjamin <davidben@mit.edu>

Parents:

89f01bd (diff), 60e8617 (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 60e8617904bd9d4cfd97f15d5ec92e713962db99 into 89f01bd9823da865a9b70dc55e7910ef2944fb0a

Files:

• functions.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

functions.c

@@ -855 +855 @@
 void owl_function_unsuball(void)
 {
-  unsuball();
-  owl_function_makemsg("Unsubscribed from all messages.");
+  if (unsuball())
+    owl_function_makemsg("Unsubscribed from all messages.");
 }
 

zephyr.c

@@ -455 +455 @@
 }
 
-void unsuball(void)
+bool unsuball(void)
 {
 #if HAVE_LIBZEPHYR
@@ -465 +465 @@
     owl_function_error("Zephyr: Cancelling subscriptions: %s",
                        error_message(ret));
-#endif
+  return (ret == ZERR_NONE);
+#endif
+  return true;
 }