Changeset dde1b4d for global.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:

• global.c (modified) (2 diffs)

global.c

@@ -77 +77 @@
   g->confdir = NULL;
   g->startupfile = NULL;
-  cd = g_strdup_printf("%s/%s", g->homedir, OWL_CONFIG_DIR);
+  cd = g_build_filename(g->homedir, OWL_CONFIG_DIR, NULL);
   owl_global_set_confdir(g, cd);
   g_free(cd);
@@ -364 +364 @@
   g->confdir = g_strdup(cd);
   g_free(g->startupfile);
-  g->startupfile = g_strdup_printf("%s/startup", cd);
+  g->startupfile = g_build_filename(cd, "startup", NULL);
 }