Changeset e3a75ed for zephyr.c

Timestamp:

Mar 5, 2011, 3:25:29 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

488913a

Parents:

010a951

git-author:

David Benjamin <davidben@mit.edu> (02/28/11 18:45:28)

git-committer:

David Benjamin <davidben@mit.edu> (03/05/11 15:25:29)

Message:

Replace the remaining snprintfs with g_strdup_printf

Hard-coded buffer sizes are silly.

File:

• zephyr.c (modified) (5 diffs)

zephyr.c

@@ -762 +762 @@
     }
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {
-    #define BUFFLEN 1024
     if (retnotice->z_recipient == NULL
         || *retnotice->z_recipient == 0
         || *retnotice->z_recipient == '@') {
-      char buff[BUFFLEN];
+      char *buff;
       owl_function_error("No one subscribed to class %s", retnotice->z_class);
-      snprintf(buff, BUFFLEN, "Could not send message to class %s: no one subscribed.\n", retnotice->z_class);
+      buff = g_strdup_printf("Could not send message to class %s: no one subscribed.\n", retnotice->z_class);
       owl_function_adminmsg("", buff);
+      g_free(buff);
     } else {
-      char buff[BUFFLEN];
+      char *buff;
       owl_zwrite zw;
       char *realm;
@@ -783 +783 @@
        */
       if(strcasecmp(retnotice->z_class, "message")) {
-        snprintf(buff, BUFFLEN,
+        buff = g_strdup_printf(
                  "Could not send message to %s: "
                  "not logged in or subscribing to class %s, instance %s.\n",
@@ -790 +790 @@
                  retnotice->z_class_inst);
       } else if(strcasecmp(retnotice->z_class_inst, "personal")) {
-        snprintf(buff, BUFFLEN,
+        buff = g_strdup_printf(
                  "Could not send message to %s: "
                  "not logged in or subscribing to instance %s.\n",
@@ -796 +796 @@
                  retnotice->z_class_inst);
       } else {
-        snprintf(buff, BUFFLEN,
+        buff = g_strdup_printf(
                  "Could not send message to %s: "
                  "not logged in or subscribing to messages.\n",
@@ -820 +820 @@
 
       owl_zwrite_cleanup(&zw);
+      g_free(buff);
       g_free(tmp);
     }