From: Ján Tomko Date: Fri, 18 Oct 2019 21:30:27 +0000 (+0200) Subject: virsh: getSignalNumber: rename variables X-Git-Tag: v5.9.0-rc1~152 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6a8c9df4df236d70ef9001420af7705ae62526b;p=thirdparty%2Flibvirt.git virsh: getSignalNumber: rename variables Use 'str' for the allocated copy of the string and 'p' for the pointer into that string. Signed-off-by: Ján Tomko Reviewed-by: Daniel Henrique Barboza --- diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 715ad51ef5..d74a671167 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8806,26 +8806,26 @@ static int getSignalNumber(vshControl *ctl, const char *signame) { size_t i; int signum; - char *lower = vshStrdup(ctl, signame); - char *tmp = lower; + char *str = vshStrdup(ctl, signame); + char *p = str; for (i = 0; signame[i]; i++) - lower[i] = c_tolower(signame[i]); + p[i] = c_tolower(signame[i]); - if (virStrToLong_i(lower, NULL, 10, &signum) >= 0) + if (virStrToLong_i(p, NULL, 10, &signum) >= 0) goto cleanup; - if (STRPREFIX(lower, "sig_")) - lower += 4; - else if (STRPREFIX(lower, "sig")) - lower += 3; + if (STRPREFIX(p, "sig_")) + p += 4; + else if (STRPREFIX(p, "sig")) + p += 3; - if ((signum = virDomainProcessSignalTypeFromString(lower)) >= 0) + if ((signum = virDomainProcessSignalTypeFromString(p)) >= 0) goto cleanup; signum = -1; cleanup: - VIR_FREE(tmp); + VIR_FREE(str); return signum; }