From 1b5814ba53290e513085fd7e19e7545da613ee53 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 2 May 2016 04:24:14 -0400
Subject: naming consistency

---
 src/config.c |  6 +++---
 src/socket.c |  2 +-
 src/util.c   | 12 ++++++------
 src/util.h   |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/config.c b/src/config.c
index 7030b78..3e4a6fa 100644
--- a/src/config.c
+++ b/src/config.c
@@ -326,10 +326,10 @@ static FILE *runes_config_get_config_file()
         config_dir = strdup(config_dir);
     }
     else {
-        sprintf_dup(&config_dir, "%s/.config", home);
+        runes_sprintf_dup(&config_dir, "%s/.config", home);
     }
 
-    sprintf_dup(&path, "%s/runes/runes.conf", config_dir);
+    runes_sprintf_dup(&path, "%s/runes/runes.conf", config_dir);
     free(config_dir);
 
     file = fopen(path, "r");
@@ -339,7 +339,7 @@ static FILE *runes_config_get_config_file()
         return file;
     }
 
-    sprintf_dup(&path, "%s/.runesrc", home);
+    runes_sprintf_dup(&path, "%s/.runesrc", home);
 
     file = fopen(path, "r");
     free(path);
diff --git a/src/socket.c b/src/socket.c
index 24f0260..8cb8680 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -49,7 +49,7 @@ static int runes_socket_open(RunesSocket *sock)
         runes_die("socket path %s must be an absolute path\n", sock->name);
     }
     *slash = '\0';
-    mkdir_p(dir);
+    runes_mkdir_p(dir);
     free(dir);
 
     unlink(sock->name);
diff --git a/src/util.c b/src/util.c
index df99149..5bd9ce0 100644
--- a/src/util.c
+++ b/src/util.c
@@ -34,19 +34,19 @@ char *runes_get_socket_name()
 
     runtime_dir = getenv("XDG_RUNTIME_DIR");
     if (runtime_dir) {
-        sprintf_dup(&socket_dir, "%s/runes", runtime_dir);
+        runes_sprintf_dup(&socket_dir, "%s/runes", runtime_dir);
     }
     else {
-        sprintf_dup(&socket_dir, "%s/.runes", home);
+        runes_sprintf_dup(&socket_dir, "%s/.runes", home);
     }
 
-    sprintf_dup(&socket_file, "%s/runesd", socket_dir);
+    runes_sprintf_dup(&socket_file, "%s/runesd", socket_dir);
     free(socket_dir);
 
     return socket_file;
 }
 
-int sprintf_dup(char **out, const char *fmt, ...)
+int runes_sprintf_dup(char **out, const char *fmt, ...)
 {
     int outlen = 0;
     va_list ap;
@@ -64,7 +64,7 @@ int sprintf_dup(char **out, const char *fmt, ...)
     return outlen;
 }
 
-void mkdir_p(char *dir)
+void runes_mkdir_p(char *dir)
 {
     char *path_component, *save_ptr, *tok_str, *partial_path;
     struct stat st;
@@ -75,7 +75,7 @@ void mkdir_p(char *dir)
     while ((path_component = strtok_r(tok_str, "/", &save_ptr))) {
         char *new_path;
 
-        sprintf_dup(&new_path, "%s%s/", partial_path, path_component);
+        runes_sprintf_dup(&new_path, "%s%s/", partial_path, path_component);
 
         if (mkdir(new_path, 0755)) {
             if (errno != EEXIST) {
diff --git a/src/util.h b/src/util.h
index b2d0a28..1e3bc63 100644
--- a/src/util.h
+++ b/src/util.h
@@ -6,7 +6,7 @@
 void runes_warn(const char *fmt, ...);
 void runes_die(const char *fmt, ...);
 char *runes_get_socket_name();
-int sprintf_dup(char **out, const char *fmt, ...);
-void mkdir_p(char *dir);
+int runes_sprintf_dup(char **out, const char *fmt, ...);
+void runes_mkdir_p(char *dir);
 
 #endif
-- 
cgit v1.2.3-54-g00ecf