Changeset bb2c60d

Timestamp:

Mar 5, 2007, 9:00:24 PM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

d08162a

Parents:

2058d7a

Message:

perlwrap.pm: getting rid of one more mainloop_hook error message.
zephyr.c: reworking zephyr subscription process (again).
  * Sub all at once if possible.
  * Don't sub to zpunt lines.

Files:

• perlwrap.pm (modified) (1 diff)
• zephyr.c (modified) (4 diffs)

perlwrap.pm

@@ -502 +502 @@
     # use $shutdown to tell modules that that's what we're doing.
     $BarnOwl::shutdown = 1;
-    BarnOwl::mainloop_hook();
+    BarnOwl::mainloop_hook() if *BarnOwl::mainloop_hook{CODE};
 
     BarnOwl::shutdown() if *BarnOwl::shutdown{CODE};

zephyr.c

@@ -88 +88 @@
     owl_free(subs[i].zsub_recipient);
   }
+
   return ret;
 }
@@ -106 +107 @@
   char *tmp, *start;
   char buffer[1024], subsfile[1024];
-  ZSubscription_t subs[3001];
+  ZSubscription_t *subs;
+  int subSize = 1024;
   int count, ret;
   struct stat statbuff;
 
+  subs = owl_malloc(sizeof(ZSubscription_t) * subSize);
   if (filename==NULL) {
     sprintf(subsfile, "%s/%s", owl_global_get_homedir(&g), ".zephyr.subs");
@@ -135 +138 @@
     }
     
-    if (count >= 3000) {
-      ret = owl_zephyr_loadsubs_helper(subs, count);
-      if (ret != 0) {
-        fclose(file);
-        return(ret);
+    if (count >= subSize) {
+      ZSubscription_t* newsubs;
+      newsubs = owl_realloc(subs, sizeof(ZSubscription_t) * subSize * 2);
+      if (NULL == newsubs) {
+        /* If realloc fails, load what we've got, clear, and continue */
+        ret = owl_zephyr_loadsubs_helper(subs, count);
+        if (ret != 0) {
+          fclose(file);
+          return(ret);
+        }
+        count=0;
       }
-      count=0;
+      else {
+        subs = newsubs;
+        subSize *= 2;
+      }
     }
     
@@ -152 +164 @@
     subs[count].zsub_recipient=owl_strdup(tmp);
     
-    /* if it started with '-' then add it to the global punt list */
+    /* if it started with '-' then add it to the global punt list, and
+     * remove it from the list of subs. */
     if (buffer[0]=='-') {
       owl_function_zpunt(subs[count].zsub_class, subs[count].zsub_classinst, subs[count].zsub_recipient, 0);
-    }
-    
-    count++;
+      owl_free(subs[count].zsub_class);
+      owl_free(subs[count].zsub_classinst);
+      owl_free(subs[count].zsub_recipient);
+    }
+    else {
+      count++;
+    }
   }
   fclose(file);
 
   ret=owl_zephyr_loadsubs_helper(subs, count);
-
+  owl_free(subs);
   return(ret);
 #else