Changeset 60e8617

Timestamp:

Apr 5, 2013, 3:27:48 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

52bee9c, 24ece84, 109eb89

Parents:

89f01bd

git-author:

David Benjamin <davidben@mit.edu> (04/05/13 15:24:24)

git-committer:

David Benjamin <davidben@mit.edu> (04/05/13 15:27:48)

Message:

Don't swallow errors in :unsuball

More code that should get fixed if we ever use GError or some other saner error
reporting mechanism. For now, I suppose this mess with the lower-level function
reporting error and the higher-level function reporting success is in good
company.

Test by doing a kdestroy before :unsuball. It should complain about a SERVNAK.
(It really should complain about missing credentials cache, but apparently
libzephyr tries again without auth in ZCancelSubscription even though the
server rejects unauthenticated ones. Meh.)

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;
 }