Changeset fc7481a

Timestamp:

Feb 4, 2011, 3:49:44 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

dfe5829

Parents:

65c753e

git-author:

David Benjamin <davidben@mit.edu> (01/24/11 17:55:19)

git-committer:

David Benjamin <davidben@mit.edu> (02/04/11 15:49:44)

Message:

strndup is pretty awesome and doesn't involve adding 5

File:

• zephyr.c (modified) (3 diffs)

zephyr.c

@@ -480 +480 @@
 {
   int i, count, save;
-  char *out;
 
   /* If there's no message here, just run along now */
@@ -500 +499 @@
   /* catch the last field, which might not be null terminated */
   if (count==j-1) {
-    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 g_strndup(n->z_message + save, n->z_message_len - save);
   }
 
@@ -532 +528 @@
   if (count == j - 1) {
     char *tmp, *out;
-    tmp = owl_malloc(n->z_message_len-save+5);
-    memcpy(tmp, n->z_message+save, n->z_message_len-save);
-    tmp[n->z_message_len-save]='\0';
+    tmp = g_strndup(n->z_message + save, n->z_message_len - save);
     out = owl_validate_or_convert(tmp);
     owl_free(tmp);