Changeset dde1b4d for logging.c

Timestamp:

Jul 15, 2011, 11:40:47 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

c6332f5

Parents:

30d0cf7

git-author:

David Benjamin <davidben@mit.edu> (07/12/11 11:58:02)

git-committer:

David Benjamin <davidben@mit.edu> (07/15/11 23:40:47)

Message:

Use g_build_filename instead of g_strdup_printf to build paths

Saves us a duplicate slash in a few places, although most of the time it
doesn't do anything. Eh, may as well use it and be more explicit or
something.

Also change the one existing call to g_build_path to g_build_filename
instead. It's much less of a pain to use.

File:

• logging.c (modified) (6 diffs)

logging.c

@@ -224 +224 @@
     while (cc != NULL) {
       temp = short_zuser(cc->data);
-      filename = g_strdup_printf("%s/%s", logpath, temp);
+      filename = g_build_filename(logpath, temp, NULL);
       owl_log_append(m, filename);
 
@@ -248 +248 @@
   }
 
-  filename = g_strdup_printf("%s/%s", logpath, to);
+  filename = g_build_filename(logpath, to, NULL);
   owl_log_append(m, filename);
   g_free(to);
   g_free(filename);
 
-  filename = g_strdup_printf("%s/all", logpath);
+  filename = g_build_filename(logpath, "all", NULL);
   owl_log_append(m, filename);
   g_free(logpath);
@@ -285 +285 @@
   /* expand ~ in path names */
   logpath = owl_util_makepath(owl_global_get_logpath(&g));
-  filename = g_strdup_printf("%s/%s", logpath, tobuff);
+  filename = g_build_filename(logpath, tobuff, NULL);
   msgbuf = g_string_new("");
   g_string_printf(msgbuf, "ERROR (owl): %s\n%s\n", tobuff, text);
@@ -294 +294 @@
   g_string_free(msgbuf, TRUE);
 
-  filename = g_strdup_printf("%s/all", logpath);
+  filename = g_build_filename(logpath, "all", NULL);
   g_free(logpath);
   msgbuf = g_string_new("");
@@ -393 +393 @@
   if (personal) {
     logpath = owl_util_makepath(owl_global_get_logpath(&g));
-    filename = g_strdup_printf("%s/%s", logpath, from);
-    allfilename = g_strdup_printf("%s/all", logpath);
+    filename = g_build_filename(logpath, from, NULL);
+    allfilename = g_build_filename(logpath, "all", NULL);
     owl_log_append(m, allfilename);
     g_free(allfilename);
   } else {
     logpath = owl_util_makepath(owl_global_get_classlogpath(&g));
-    filename = g_strdup_printf("%s/%s", logpath, from);
+    filename = g_build_filename(logpath, from, NULL);
   }
 
@@ -415 +415 @@
       temp = short_zuser(cc->data);
       if (strcasecmp(temp, frombuff) != 0) {
-        filename = g_strdup_printf("%s/%s", logpath, temp);
+        filename = g_build_filename(logpath, temp, NULL);
         owl_log_append(m, filename);
         g_free(filename);