Changeset e3a75ed

Timestamp:

Mar 5, 2011, 3:25:29 PM (13 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.

Files:

• functions.c (modified) (2 diffs)
• logging.c (modified) (9 diffs)
• zephyr.c (modified) (5 diffs)

functions.c

@@ -2258 +2258 @@
   const owl_filter *f;
   const owl_list *fl;
-  char buff[5000];
   char *tmp;
   owl_fmtext fm;
@@ -2271 +2270 @@
   for (i=0; i<j; i++) {
     f=owl_list_get_element(fl, i);
-    snprintf(buff, sizeof(buff), "[% 2d] ", i+1);
-    owl_fmtext_append_normal(&fm, buff);
+    owl_fmtext_appendf_normal(&fm, "[% 2d] ", i+1);
     tmp = owl_filter_print(f);
     owl_fmtext_append_normal(&fm, tmp);

logging.c

@@ -126 +126 @@
 void owl_log_outgoing(const owl_message *m)
 {
-  char filename[MAXPATHLEN], *logpath;
+  char *filename, *logpath;
   char *to, *temp;
   GList *cc;
@@ -139 +139 @@
     while (cc != NULL) {
       temp = short_zuser(cc->data);
-      snprintf(filename, MAXPATHLEN, "%s/%s", logpath, temp);
+      filename = g_strdup_printf("%s/%s", logpath, temp);
       owl_log_append(m, filename);
 
+      g_free(filename);
       g_free(temp);
       g_free(cc->data);
@@ -162 +163 @@
   }
 
-  snprintf(filename, MAXPATHLEN, "%s/%s", logpath, to);
+  filename = g_strdup_printf("%s/%s", logpath, to);
   owl_log_append(m, filename);
   g_free(to);
-
-  snprintf(filename, MAXPATHLEN, "%s/all", logpath);
+  g_free(filename);
+
+  filename = g_strdup_printf("%s/all", logpath);
   owl_log_append(m, filename);
   g_free(logpath);
+  g_free(filename);
 }
 
@@ -175 +178 @@
 {
   FILE *file;
-  char filename[MAXPATHLEN], *logpath;
+  char *filename, *logpath;
   char *tobuff;
   owl_message *m;
@@ -196 +199 @@
   logpath = owl_util_makepath(owl_global_get_logpath(&g));
 
-  snprintf(filename, MAXPATHLEN, "%s/%s", logpath, tobuff);
+  filename = g_strdup_printf("%s/%s", logpath, tobuff);
   file=fopen(filename, "a");
+  g_free(filename);
   if (!file) {
     owl_function_error("Unable to open file for outgoing logging");
@@ -210 +214 @@
   fclose(file);
 
-  snprintf(filename, MAXPATHLEN, "%s/all", logpath);
+  filename = g_strdup_printf("%s/all", logpath);
   g_free(logpath);
   file=fopen(filename, "a");
+  g_free(filename);
   if (!file) {
     owl_function_error("Unable to open file for outgoing logging");
@@ -229 +234 @@
 void owl_log_incoming(const owl_message *m)
 {
-  char filename[MAXPATHLEN], allfilename[MAXPATHLEN], *logpath;
+  char *filename, *allfilename, *logpath;
   const char *from=NULL;
   char *frombuff=NULL;
@@ -311 +316 @@
   if (personal) {
     logpath = owl_util_makepath(owl_global_get_logpath(&g));
-    snprintf(filename, MAXPATHLEN, "%s/%s", logpath, from);
-    snprintf(allfilename, MAXPATHLEN, "%s/all", logpath);
+    filename = g_strdup_printf("%s/%s", logpath, from);
+    allfilename = g_strdup_printf("%s/all", logpath);
     owl_log_append(m, allfilename);
-
+    g_free(allfilename);
   } else {
     logpath = owl_util_makepath(owl_global_get_classlogpath(&g));
-    snprintf(filename, MAXPATHLEN, "%s/%s", logpath, from);
+    filename = g_strdup_printf("%s/%s", logpath, from);
   }
 
   owl_log_append(m, filename);
+  g_free(filename);
 
   if (personal && owl_message_is_type_zephyr(m)) {
@@ -332 +338 @@
       temp = short_zuser(cc->data);
       if (strcasecmp(temp, frombuff) != 0) {
-        snprintf(filename, MAXPATHLEN, "%s/%s", logpath, temp);
+        filename = g_strdup_printf("%s/%s", logpath, temp);
         owl_log_append(m, filename);
+        g_free(filename);
       }
 

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);
     }