Changeset dcc3f80 for zephyr.c

Timestamp:

Oct 10, 2009, 9:24:41 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

68ab07c

Parents:

69c3878 (diff), 32ad44d (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 branch 'zephyr-fixes'

File:

• zephyr.c (modified) (6 diffs)

zephyr.c

@@ -82 +82 @@
 void owl_zephyr_finish_initialization(owl_dispatch *d) {
   Code_t code;
+  char *perl;
 
   owl_select_remove_dispatch(d->fd);
@@ -125 +126 @@
     owl_function_zephyr_buddy_check(0);
   }
+
+ perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
+ owl_free(perl);
 }
 
@@ -168 +172 @@
   }
 #endif
-  return(0);
+  return 0;
 }
 
@@ -176 +180 @@
   if(owl_global_is_havezephyr(&g))
     return(ZPending());
-  else
-    return 0;
-#else
-  return(0);
-#endif
+#endif
+  return 0;
 }
 
@@ -186 +187 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  return(ZGetRealm());
-#else
-  return("");
-#endif
+  if (owl_global_is_havezephyr(&g))
+    return(ZGetRealm());
+#endif
+  return "";
 }
 
@@ -195 +196 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  return(ZGetSender());
-#else
-  return("");
-#endif
+  if (owl_global_is_havezephyr(&g))
+    return(ZGetSender());
+#endif
+  return "";
 }