Changeset df3a1f4

Timestamp:

Feb 4, 2011, 3:49:44 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

0290b2a

Parents:

9de316d1

git-author:

David Benjamin <davidben@mit.edu> (01/24/11 23:16:10)

git-committer:

David Benjamin <davidben@mit.edu> (02/04/11 15:49:44)

Message:

Replace realloc logic in owl_zephyr_getsubs with GString

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -1127 +1127 @@
 #ifdef HAVE_LIBZEPHYR
   int ret, num, i, one;
-  int buffsize;
   ZSubscription_t sub;
-  char *out;
-  one=1;
+  GString *buf;
 
   ret=ZRetrieveSubscriptions(0, &num);
@@ -1139 +1137 @@
   }
 
-  buffsize = (num + 1) * 50;
-  out=owl_malloc(buffsize);
-  strcpy(out, "");
+  buf = g_string_new("");
   for (i=0; i<num; i++) {
+    one = 1;
     if ((ret = ZGetSubscriptions(&sub, &one)) != ZERR_NONE) {
-      owl_free(out);
       ZFlushSubscriptions();
-      out=owl_strdup("Error while getting subscriptions\n");
-      return(out);
+      g_string_free(buf, true);
+      return owl_strdup("Error while getting subscriptions\n");
     } else {
-      int tmpbufflen;
-      char *tmpbuff;
-      tmpbuff = owl_sprintf("<%s,%s,%s>\n%s", sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient, out);
-      tmpbufflen = strlen(tmpbuff) + 1;
-      if (tmpbufflen > buffsize) {
-        char *out2;
-        buffsize = tmpbufflen * 2;
-        out2 = owl_realloc(out, buffsize);
-        if (out2 == NULL) {
-          owl_free(out);
-          owl_free(tmpbuff);
-          ZFlushSubscriptions();
-          out=owl_strdup("Realloc error while getting subscriptions\n");
-          return(out);    
-        }
-        out = out2;
-      }
-      strcpy(out, tmpbuff);
-      owl_free(tmpbuff);
+      /* g_string_append_printf would be backwards. */
+      char *tmp = owl_sprintf("<%s,%s,%s>\n",
+                              sub.zsub_class,
+                              sub.zsub_classinst,
+                              sub.zsub_recipient);
+      g_string_prepend(buf, tmp);
+      owl_free(tmp);
     }
   }
 
   ZFlushSubscriptions();
-  return(out);
+  return g_string_free(buf, false);
 #else
   return(owl_strdup("Zephyr not available"));