Changeset b7a74a8

Timestamp:

Feb 18, 2013, 2:58:37 AM (12 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

6a20996 (diff), bbe7d4a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge bbe7d4a8ffa8c6c6b49ff192f54df4c385dfc1cb into 6a209963395d62d98c3d6b52daa6fb2e3054ae1b

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -291 +291 @@
   struct stat statbuff;
 
-  subs = g_new(ZSubscription_t, subSize);
   subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
 
@@ -307 +306 @@
   if (!file)
     return -1;
+
+  subs = g_new(ZSubscription_t, subSize);
   while (owl_getline(&buffer, file)) {
     if (buffer[0] == '#' || buffer[0] == '\n')