From 97ce0aa51961b6117543ffcab5aaeeee8cb36235 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Fri, 28 Feb 2020 14:36:14 +0100 Subject: [PATCH] Rename local variable shadowing variable in outer scope Signed-off-by: Joachim Nilsson --- src/cond.c | 10 +++++----- src/pid.c | 2 +- src/service.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cond.c b/src/cond.c index afcc6893..14bbf988 100644 --- a/src/cond.c +++ b/src/cond.c @@ -49,8 +49,8 @@ const char *condstr(enum cond_state s) const char *cond_path(const char *name) { - char tmp[MAX_ARG_LEN]; static char path[256]; + char tmp[MAX_ARG_LEN]; snprintf(tmp, sizeof(tmp), COND_PATH "/%s", name); @@ -59,8 +59,8 @@ const char *cond_path(const char *name) unsigned int cond_get_gen(const char *file) { - char *ptr, path[256]; unsigned int gen; + char *ptr, path[256]; FILE *fp; int ret; @@ -99,9 +99,9 @@ enum cond_state cond_get(const char *name) enum cond_state cond_get_agg(const char *names) { - char *cond; - enum cond_state s = COND_ON; static char conds[MAX_COND_LEN]; + enum cond_state s = COND_ON; + char *cond; if (!names) return COND_ON; @@ -115,8 +115,8 @@ enum cond_state cond_get_agg(const char *names) int cond_affects(const char *name, const char *names) { - char *cond; static char conds[MAX_COND_LEN]; + char *cond; if (!name || !names) return 0; diff --git a/src/pid.c b/src/pid.c index 3687ca69..1e792b14 100644 --- a/src/pid.c +++ b/src/pid.c @@ -95,8 +95,8 @@ char *pid_get_name(pid_t pid, char *name, size_t len) char *pid_file(svc_t *svc) { - char fn[MAX_ARG_LEN]; static char path[256]; + char fn[MAX_ARG_LEN]; if (svc->pidfile[0]) { if (svc->pidfile[0] == '!') diff --git a/src/service.c b/src/service.c index 6ab801eb..f280f07c 100644 --- a/src/service.c +++ b/src/service.c @@ -1351,10 +1351,10 @@ restart: svc_set_state(svc, SVC_RUNNING_STATE); /* Reassert condition if we go from waiting and no change */ if (!svc_is_changed(svc)) { - char cond[MAX_COND_LEN]; + char name[MAX_COND_LEN]; - mkcond(cond, sizeof(cond), svc->cmd); - cond_set_path(cond_path(cond), COND_ON); + mkcond(name, sizeof(name), svc->cmd); + cond_set_path(cond_path(name), COND_ON); } break;