Changeset b0430a6 for zephyr.c

Timestamp:

Dec 21, 2003, 8:19:14 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:

2de4f20

Parents:

72836b5

Message:

New zephyr_get_field function

File:

• zephyr.c (modified) (5 diffs)

zephyr.c

@@ -257 +257 @@
 }
 
-#ifdef HAVE_LIBZEPHYR
-char *owl_zephyr_get_field(ZNotice_t *n, int j, int *k)
-{
-  /* return a pointer to the Jth field, place the length in k.  If the
-     field doesn't exist return an emtpy string */
+/* return a pointer to the data in the Jth field, (NULL terminated by
+ * definition).  Caller must free the return.
+ */
+#ifdef HAVE_LIBZEPHYR
+char *owl_zephyr_get_field(ZNotice_t *n, int j)
+{
   int i, count, save;
+  char *out;
 
   count=save=0;
@@ -270 +272 @@
       if (count==j) {
         /* just found the end of the field we're looking for */
-        *k=i-save;
-        return(n->z_message+save);
+        return(owl_strdup(n->z_message+save));
       } else {
         save=i+1;
@@ -277 +278 @@
     }
   }
-  /* catch the last field */
+  /* catch the last field, which might not be null terminated */
   if (count==j-1) {
-    *k=n->z_message_len-save;
-    return(n->z_message+save);
-  }
-  
-  *k=0;
-  return("");
+    out=owl_malloc(n->z_message_len-save+5);
+    memcpy(out, n->z_message+save, n->z_message_len-save);
+    out[n->z_message_len-save]='\0';
+    return(out);
+  }
+
+  return(owl_strdup(""));
 }
 #else
 char *owl_zephyr_get_field(void *n, int j, int *k)
 {
-  return("");
-}
-#endif
+  return(owl_strdup(""));
+}
+#endif
+
 
 #ifdef HAVE_LIBZEPHYR
@@ -313 +316 @@
 
 #ifdef HAVE_LIBZEPHYR
-char *owl_zephyr_get_message(ZNotice_t *n, int *k)
-{
-  /* return a pointer to the message, place the message length in k */
+/* return a pointer to the message, place the message length in k */
+char *owl_zephyr_get_message(ZNotice_t *n)
+{
   if (!strcasecmp(n->z_opcode, "ping")) {
-    *k=0;
     return("");
   }
 
-  return(owl_zephyr_get_field(n, 2, k));
+  return(owl_zephyr_get_field(n, 2));
 }
 #endif
@@ -793 +795 @@
 }
   
-
 /* Strip a local realm fron the zephyr user name.
  * The caller must free the return