From 6d17c545e84fc37078783e72676c6d88595fee6d Mon Sep 17 00:00:00 2001 From: smitsohu Date: Fri, 15 Jan 2021 14:41:38 +0100 Subject: fbuilder: undo variable shadowing --- src/fbuilder/build_profile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c index 0517c837e..09f41a838 100644 --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c @@ -85,12 +85,12 @@ void build_profile(int argc, char **argv, int index, FILE *fp) { int have_yama_permission = 1; if (access("/usr/bin/strace", X_OK) == 0) { have_strace = 1; - FILE *fp = fopen("/proc/sys/kernel/yama/ptrace_scope", "r"); - if (fp) { + FILE *ps = fopen("/proc/sys/kernel/yama/ptrace_scope", "r"); + if (ps) { unsigned val; - if (fscanf(fp, "%u", &val) == 1) + if (fscanf(ps, "%u", &val) == 1) have_yama_permission = (val < 2); - fclose(fp); + fclose(ps); } } @@ -102,10 +102,10 @@ void build_profile(int argc, char **argv, int index, FILE *fp) { cmd[0] = cmdlist[0]; // explicit assignment to clean scan-build error // build command + // skip strace if not installed, or no permission to use it int skip_strace = !(have_strace && have_yama_permission); unsigned i = 0; for (i = 0; i < (int) sizeof(cmdlist) / sizeof(char*); i++) { - // skip strace if not installed, or no permission to use it if (skip_strace && strcmp(cmdlist[i], "/usr/bin/strace") == 0) break; cmd[i] = cmdlist[i]; -- cgit v1.2.3-70-g09d2