Changeset e3a75ed for logging.c

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, 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:

• logging.c (modified) (9 diffs)

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