Changeset c73a22d

Timestamp:

Mar 6, 2011, 2:14:39 PM (13 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

00842c3

Parents:

488913a

git-author:

Karl Ramm <kcr@1ts.org> (02/11/11 23:57:39)

git-committer:

Karl Ramm <kcr@1ts.org> (03/06/11 14:14:39)

Message:

when something goes wrong, give more information about what happened

These various utility functions, instead of just saying "there was an
error", should report to the user what the library thinks went wrong
so they user has some small chance of debugging the problem.

Reviewed-By: Nelson Elhage <nelhage@nelhage.com>

File:

• zephyr.c (modified) (10 diffs)

zephyr.c

@@ -211 +211 @@
 {
   int ret = 0;
+  Code_t code;
+
   if (owl_global_is_havezephyr(&g)) {
     int i;
     /* sub without defaults */
-    if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
-      owl_function_error("Error subscribing to zephyr notifications.");
+    code = ZSubscribeToSansDefaults(subs, count, 0);
+    if (code != ZERR_NONE) {
+      owl_function_error("Error subscribing to zephyr notifications: %s",
+                         error_message(code));
       ret=-2;
     }
@@ -351 +355 @@
 {
 #ifdef HAVE_LIBZEPHYR
+  Code_t ret;
+
   if (owl_global_is_havezephyr(&g)) {
     ZSubscription_t subs[10];
-    
-    if (ZSubscribeTo(subs,0,0) != ZERR_NONE) {
-      owl_function_error("Error subscribing to default zephyr notifications.");
+
+    ret = ZSubscribeTo(subs, 0, 0);
+    if (ret != ZERR_NONE) {
+      owl_function_error("Error subscribing to default zephyr notifications: %s.",
+                           error_message(ret));
       return(-1);
     }
@@ -435 +443 @@
 #ifdef HAVE_LIBZEPHYR
   ZSubscription_t subs[5];
+  Code_t ret;
 
   subs[0].zsub_class=zstr(class);
@@ -441 +450 @@
 
   ZResetAuthentication();
-  if (ZSubscribeTo(subs,1,0) != ZERR_NONE) {
-    owl_function_error("Error subbing to <%s,%s,%s>", class, inst, recip);
+  ret = ZSubscribeTo(subs, 1, 0);
+  if (ret != ZERR_NONE) {
+    owl_function_error("Error subbing to <%s,%s,%s>: %s",
+                       class, inst, recip,
+                       error_message(ret));
     return(-2);
   }
@@ -456 +468 @@
 #ifdef HAVE_LIBZEPHYR
   ZSubscription_t subs[5];
+  Code_t ret;
 
   subs[0].zsub_class=zstr(class);
@@ -462 +475 @@
 
   ZResetAuthentication();
-  if (ZUnsubscribeTo(subs,1,0) != ZERR_NONE) {
-    owl_function_error("Error unsubbing from <%s,%s,%s>", class, inst, recip);
+  ret = ZUnsubscribeTo(subs, 1, 0);
+  if (ret != ZERR_NONE) {
+    owl_function_error("Error unsubbing from <%s,%s,%s>: %s",
+                       class, inst, recip,
+                       error_message(ret));
     return(-2);
   }
@@ -668 +684 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  int ret;
+  Code_t ret;
   ZNotice_t notice;
     
@@ -703 +719 @@
   g_free(notice.z_message);
   ZFreeNotice(&notice);
-  if (ret!=ZERR_NONE) {
-    owl_function_error("Error sending zephyr");
+  if (ret != ZERR_NONE) {
+    owl_function_error("Error sending zephyr: %s", error_message(ret));
     return(ret);
   }
@@ -1130 +1146 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  int ret, num, i, one;
+  Code_t ret;
+  int num, i, one;
   ZSubscription_t sub;
   GString *buf;
 
-  ret=ZRetrieveSubscriptions(0, &num);
-  if (ret==ZERR_TOOMANYSUBS) {
-    return(g_strdup("Zephyr: too many subscriptions\n"));
-  } else if (ret || (num <= 0)) {
-    return(g_strdup("Zephyr: error retrieving subscriptions\n"));
-  }
+  ret = ZRetrieveSubscriptions(0, &num);
+  if (ret != ZERR_NONE)
+    return g_strdup_printf("Zephyr: Requesting subscriptions: %s\n", error_message(ret));
+  if (num == 0)
+    return g_strdup("Zephyr: No subscriptions retrieved\n");
 
   buf = g_string_new("");
@@ -1147 +1163 @@
       ZFlushSubscriptions();
       g_string_free(buf, true);
-      return g_strdup("Error while getting subscriptions\n");
+      return g_strdup_printf("Zephyr: Getting subscriptions: %s\n", error_message(ret));
     } else {
       /* g_string_append_printf would be backwards. */