From 37987757e175db46c567a77d8372124eba764918 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 7 Aug 2019 11:09:50 -0500 Subject: [PATCH] resolve: rename RESOLVCONF_PATH Since it is no longer a define, switch to using lower-case letters --- src/resolve.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/resolve.c b/src/resolve.c index 2df98800..2cff2f63 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -50,7 +50,7 @@ struct resolve_method { }; static struct resolve_method method; -static char *RESOLVCONF_PATH; +static char *resolvconf_path; #define SYSTEMD_RESOLVED_SERVICE "org.freedesktop.resolve1" #define SYSTEMD_RESOLVED_MANAGER_PATH "/org/freedesktop/resolve1" @@ -257,10 +257,10 @@ static void resolve_resolvconf_add_dns(uint32_t ifindex, uint8_t type, if (!*ready) return; - cmd = l_strdup_printf("%s -a %u", RESOLVCONF_PATH, ifindex); + cmd = l_strdup_printf("%s -a %u", resolvconf_path, ifindex); if (!(resolvconf = popen(cmd, "w"))) { - l_error("resolve: Failed to start %s (%s).", RESOLVCONF_PATH, + l_error("resolve: Failed to start %s (%s).", resolvconf_path, strerror(errno)); return; } @@ -274,14 +274,14 @@ static void resolve_resolvconf_add_dns(uint32_t ifindex, uint8_t type, if (fprintf(resolvconf, "%s", str) < 0) l_error("resolve: Failed to print into %s stdin.", - RESOLVCONF_PATH); + resolvconf_path); error = pclose(resolvconf); if (error < 0) l_error("resolve: Failed to close pipe to %s (%s).", - RESOLVCONF_PATH, strerror(errno)); + resolvconf_path, strerror(errno)); else if (error > 0) - l_info("resolve: %s exited with status (%d).", RESOLVCONF_PATH, + l_info("resolve: %s exited with status (%d).", resolvconf_path, error); } @@ -295,10 +295,10 @@ static void resolve_resolvconf_remove(uint32_t ifindex, void *data) if (!*ready) return; - cmd = l_strdup_printf("%s -d %u", RESOLVCONF_PATH, ifindex); + cmd = l_strdup_printf("%s -d %u", resolvconf_path, ifindex); if (!(resolvconf = popen(cmd, "r"))) { - l_error("resolve: Failed to start %s (%s).", RESOLVCONF_PATH, + l_error("resolve: Failed to start %s (%s).", resolvconf_path, strerror(errno)); return; } @@ -306,9 +306,9 @@ static void resolve_resolvconf_remove(uint32_t ifindex, void *data) error = pclose(resolvconf); if (error < 0) l_error("resolve: Failed to close pipe to %s (%s).", - RESOLVCONF_PATH, strerror(errno)); + resolvconf_path, strerror(errno)); else if (error > 0) - l_info("resolve: %s exited with status (%d).", RESOLVCONF_PATH, + l_info("resolve: %s exited with status (%d).", resolvconf_path, error); } @@ -324,19 +324,19 @@ static void *resolve_resolvconf_init(void) l_debug("Trying to find resolvconf in $PATH"); path = getenv("PATH"); if (path) - RESOLVCONF_PATH = l_path_find("resolvconf", path, X_OK); + resolvconf_path = l_path_find("resolvconf", path, X_OK); - if (!RESOLVCONF_PATH) { + if (!resolvconf_path) { l_debug("Trying to find resolvconf in default paths"); - RESOLVCONF_PATH = l_path_find("resolvconf", default_path, X_OK); + resolvconf_path = l_path_find("resolvconf", default_path, X_OK); } - if (!RESOLVCONF_PATH) { + if (!resolvconf_path) { l_error("No usable resolvconf found on system"); return ready; } - l_debug("resolvconf found as: %s", RESOLVCONF_PATH); + l_debug("resolvconf found as: %s", resolvconf_path); *ready = true; return ready; } @@ -345,7 +345,7 @@ static void resolve_resolvconf_exit(void *data) { bool *ready = data; - RESOLVCONF_PATH = NULL; + resolvconf_path = NULL; l_free(ready); }