Changeset 9bd2c17 for functions.c

Timestamp:

Aug 17, 2002, 1:50:48 PM (22 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

5eeea3b

Parents:

67103d4

Message:

Changed getsubs to print subs in the order you get them in.

File:

• functions.c (modified) (3 diffs)

functions.c

@@ -1263 +1263 @@
   int ret, num, i, one;
   ZSubscription_t sub;
-  char *buff;
+  char *buff, *tmpbuff;
 
   one = 1;
@@ -1269 +1269 @@
   ret=ZRetrieveSubscriptions(0, &num);
   if (ret == ZERR_TOOMANYSUBS) {
-
-  }
-
-  buff=owl_malloc(num*200);
+    owl_function_makemsg("Zephyr: too many subscriptions");
+    return;
+  }
+
+  buff=owl_malloc(num*500);
+  tmpbuff=owl_malloc(2048);
   strcpy(buff, "");
   for (i=0; i<num; i++) {
     if ((ret = ZGetSubscriptions(&sub, &one)) != ZERR_NONE) {
-      /* deal with error */
+      owl_function_makemsg("Error while getting subscriptions");
+      owl_free(buff);
+      owl_free(tmpbuff);
+      ZFlushSubscriptions();
+      return;
     } else {
-      sprintf(buff, "%s<%s,%s,%s>\n", buff, sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient);
+      sprintf(tmpbuff, "<%s,%s,%s>\n%s", sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient, buff);
+      strcpy(buff, tmpbuff);
     }
   }
@@ -1284 +1291 @@
   owl_function_popless_text(buff);
   owl_free(buff);
+  owl_free(tmpbuff);
   ZFlushSubscriptions();
 }