Changeset be0a79f for zephyr.c

Timestamp:

Jun 21, 2003, 1:54:20 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

0c502e9

Parents:

5639bf2

Message:

Started work making owl build without zephyr.  Long way left to go though.

File:

• zephyr.c (modified) (22 diffs)

zephyr.c

@@ -12 +12 @@
 Code_t ZResetAuthentication();
 
+int owl_zephyr_initialize()
+{
+  int ret;
+  
+  if ((ret = ZInitialize()) != ZERR_NONE) {
+    com_err("owl",ret,"while initializing");
+    return(1);
+  }
+  if ((ret = ZOpenPort(NULL)) != ZERR_NONE) {
+    com_err("owl",ret,"while opening port");
+    return(1);
+  }
+  return(0);
+}
+
+int owl_zephyr_zpending()
+{
+#ifdef HAVE_LIBZEPHYR
+  return(ZPending());
+#else
+  return(0);
+#endif
+}
+
 int owl_zephyr_loadsubs(char *filename)
 {
+#ifdef HAVE_LIBZEPHYR
   /* return 0  on success
    *        -1 on file error
@@ -83 +108 @@
 
   return(ret);
+#else
+  return(0);
+#endif
 }
 
 int owl_zephyr_loadloginsubs(char *filename)
 {
+#ifdef HAVE_LIBZEPHYR
   FILE *file;
   ZSubscription_t subs[3001];
@@ -139 +168 @@
 
   return(ret);
+#else
+  return(0);
+#endif
 }
 
 void unsuball()
 {
+#if HAVE_LIBZEPHYR
   int ret;
 
@@ -150 +183 @@
     com_err("owl",ret,"while unsubscribing");
   }
+#endif
 }
 
 int owl_zephyr_sub(char *class, char *inst, char *recip)
 {
+#ifdef HAVE_LIBZEPHYR
   ZSubscription_t subs[5];
   int ret;
@@ -167 +202 @@
   }
   return(0);
+#else
+  return(0);
+#endif
 }
 
@@ -172 +210 @@
 int owl_zephyr_unsub(char *class, char *inst, char *recip)
 {
+#ifdef HAVE_LIBZEPHYR
   ZSubscription_t subs[5];
   int ret;
@@ -185 +224 @@
   }
   return(0);
-}
-
-
+#else
+  return(0);
+#endif
+}
+
+#ifdef HAVE_LIBZEPHYR
 char *owl_zephyr_get_field(ZNotice_t *n, int j, int *k)
 {
@@ -216 +258 @@
   return("");
 }
-
-
+#endif
+
+#ifdef HAVE_LIBZEPHYR
 int owl_zephyr_get_num_fields(ZNotice_t *n)
 {
@@ -229 +272 @@
   return(fields);
 }
-
-
+#endif
+
+#ifdef HAVE_LIBZEPHYR
 char *owl_zephyr_get_message(ZNotice_t *n, int *k)
 {
@@ -241 +285 @@
   return(owl_zephyr_get_field(n, 2, k));
 }
-
-
+#endif
+
+#ifdef HAVE_LIBZEPHYR
 char *owl_zephyr_get_zsig(ZNotice_t *n, int *k)
 {
@@ -254 +299 @@
   return(n->z_message);
 }
-
+#endif
 
 int send_zephyr(char *opcode, char *zsig, char *class, char *instance, char *recipient, char *message)
 {
+#ifdef HAVE_LIBZEPHYR
   int ret;
   ZNotice_t notice;
@@ -293 +339 @@
     return(ret);
   }
-
-  return(0);
-}
-
+  return(0);
+#else
+  return(0);
+#endif
+}
+
+#ifdef HAVE_LIBZEPHYR
 Code_t send_zephyr_helper(ZNotice_t *notice, char *buf, int len, int wait)
 {
   return(ZSendPacket(buf, len, 0));
 }
+#endif
 
 void send_ping(char *to)
 {
+#ifdef HAVE_LIBZEPHYR
   send_zephyr("PING", "", "MESSAGE", "PERSONAL", to, "");
-}
-
+#endif
+}
+
+#ifdef HAVE_LIBZEPHYR
 void owl_zephyr_handle_ack(ZNotice_t *retnotice)
 {
@@ -343 +396 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_LIBZEPHYR
 int owl_zephyr_notice_is_ack(ZNotice_t *n)
 {
@@ -352 +407 @@
   return(0);
 }
+#endif
   
 void owl_zephyr_zaway(owl_message *m)
 {
+#ifdef HAVE_LIBZEPHYR
   char *tmpbuff, *myuser, *to;
   
@@ -392 +449 @@
   owl_function_make_outgoing_zephyr(owl_global_get_zaway_msg(&g), tmpbuff, "Automated reply:");
   owl_free(tmpbuff);
-}
-
-
+#endif
+}
+
+#ifdef HAVE_LIBZEPHYR
 void owl_zephyr_hackaway_cr(ZNotice_t *n)
 {
@@ -406 +464 @@
   }
 }
+#endif
 
 void owl_zephyr_zlocate(char *user, char *out, int auth)
 {
+#ifdef HAVE_LIBZEPHYR
   int ret, numlocs;
   int one = 1;
@@ -434 +494 @@
     owl_free(myuser);
   }
+#endif
 }
 
 void owl_zephyr_addsub(char *filename, char *class, char *inst, char *recip)
 {
+#ifdef HAVE_LIBZEPHYR
   char *line, subsfile[LINE], buff[LINE];
   FILE *file;
@@ -477 +539 @@
   
   owl_free(line);
+#endif
 }
 
 void owl_zephyr_delsub(char *filename, char *class, char *inst, char *recip)
 {
+#ifdef HAVE_LIBZEPHYR
   char *line, subsfile[LINE], buff[LINE], *text;
   char backupfilename[LINE];
@@ -544 +608 @@
 
   owl_function_makemsg("Subscription removed");
+#endif
 }
 
@@ -559 +624 @@
 void owl_zephyr_zlog_in(void)
 {
+#ifdef HAVE_LIBZEPHYR
   char *exposure, *eset;
   int ret;
@@ -590 +656 @@
     */
   }
+#endif
 }
 
 void owl_zephyr_zlog_out(void)
 {
+#ifdef HAVE_LIBZEPHYR
   int ret;
 
@@ -605 +673 @@
     */
   }
+#endif
 }