wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-06 15:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

initctl: minor, fix shadowing of global variable

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2022-01-10 21:38:19 +01:00
1 parent a37037ded4
commit 5d08353284
1 file changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files
src/initctl.c
+7 -7
View File
@@ -174,11 +174,11 @@ static int do_runlevel(char *arg)
if (!arg) { if (!arg) {
int prevlevel = 0; int prevlevel = 0;
int runlevel; int currlevel;
char prev; char prev;
runlevel = runlevel_get(&prevlevel); currlevel = runlevel_get(&prevlevel);
if (255 == runlevel) { if (255 == currlevel) {
printf("unknown\n"); printf("unknown\n");
return 0; return 0;
} }
@@ -187,7 +187,7 @@ static int do_runlevel(char *arg)
if (prev <= '0' || prev > '9') if (prev <= '0' || prev > '9')
prev = 'N'; prev = 'N';
printf("%c %d\n", prev , runlevel); printf("%c %d\n", prev , currlevel);
return 0; return 0;
} }
@@ -545,7 +545,7 @@ static int show_version(char *arg)
* Pointer to string on the form [2345], may be up to 12 chars long, * Pointer to string on the form [2345], may be up to 12 chars long,
* plus escape sequences for highlighting current runlevel. * plus escape sequences for highlighting current runlevel.
*/ */
char *runlevel_string(int runlevel, int levels) char *runlevel_string(int currlevel, int levels)
{ {
int i, pos = 1; int i, pos = 1;
static char lvl[21]; static char lvl[21];
@@ -555,7 +555,7 @@ char *runlevel_string(int runlevel, int levels)
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
if (ISSET(levels, i)) { if (ISSET(levels, i)) {
if (!plain && runlevel == i) if (!plain && currlevel == i)
pos = strlcat(lvl, "\e[1m", sizeof(lvl)); pos = strlcat(lvl, "\e[1m", sizeof(lvl));
if (i == 0) if (i == 0)
@@ -563,7 +563,7 @@ char *runlevel_string(int runlevel, int levels)
else else
lvl[pos++] = '0' + i; lvl[pos++] = '0' + i;
if (!plain && runlevel == i) if (!plain && currlevel == i)
pos = strlcat(lvl, "\e[0m", sizeof(lvl)); pos = strlcat(lvl, "\e[0m", sizeof(lvl));
} else { } else {
lvl[pos++] = '-'; lvl[pos++] = '-';