Changeset d21efbc for zephyr.c

Timestamp:

Mar 7, 2009, 7:04:55 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

a5e7ed6

Parents:

0cff2b4

Message:

Correctly load .anyone files over 3000 users.

More importantly, refactor the code slightly to share more code.

File:

• zephyr.c (modified) (7 diffs)

zephyr.c

@@ -192 +192 @@
   }
 
+  owl_free(subs);
+
   return ret;
 }
@@ -242 +244 @@
     
     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;
-      }
-      else {
-        subs = newsubs;
-        subSize *= 2;
-      }
+      subSize *= 2;
+      subs = owl_realloc(subs, sizeof(ZSubscription_t) * subSize);
     }
     
@@ -282 +271 @@
 
   owl_zephyr_loadsubs_helper(subs, count);
-  owl_free(subs);
   return(ret);
 #else
@@ -308 +296 @@
 #ifdef HAVE_LIBZEPHYR
   FILE *file;
-  ZSubscription_t subs[3001];
+  ZSubscription_t *subs;
+  int numSubs = 100;
   char subsfile[1024], buffer[1024];
-  int count, ret, i;
+  int count, ret;
   struct stat statbuff;
+
+  subs = owl_malloc(numSubs * sizeof(ZSubscription_t));
 
   if (filename==NULL) {
@@ -325 +316 @@
 
   ZResetAuthentication();
-  /* need to redo this to do chunks, not just bag out after 3000 */
   count=0;
   file=fopen(subsfile, "r");
@@ -332 +322 @@
       if (buffer[0]=='#' || buffer[0]=='\n' || buffer[0]=='\n') continue;
       
-      if (count >= 3000) break; /* also tell the user */
+      if (count == numSubs) {
+        numSubs *= 2;
+        subs = owl_realloc(subs, numSubs * sizeof(ZSubscription_t));
+      }
 
       buffer[strlen(buffer)-1]='\0';
-      subs[count].zsub_class="login";
-      subs[count].zsub_recipient="*";
+      subs[count].zsub_class=owl_strdup("login");
+      subs[count].zsub_recipient=owl_strdup("*");
       if (strchr(buffer, '@')) {
-        subs[count].zsub_classinst=owl_strdup(buffer);
+        subs[count].zsub_classinst=owl_strdup(buffer);
       } else {
-        subs[count].zsub_classinst=owl_sprintf("%s@%s", buffer, ZGetRealm());
+        subs[count].zsub_classinst=owl_sprintf("%s@%s", buffer, ZGetRealm());
       }
 
@@ -351 +344 @@
   }
 
-  /* sub with defaults */
-  if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
-    owl_function_error("Error subscribing to zephyr notifications.");
-    ret=-2;
-  }
-
-  /* free stuff */
-  for (i=0; i<count; i++) {
-    owl_free(subs[i].zsub_classinst);
-  }
+  ret = owl_zephyr_loadsubs_helper(subs, count);
 
   return(ret);