d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence Clang Scan warning about use of unitialized variable.

Browse Source 
While the warning is a false positive, it is possible to clarify the code by
always initializing the variable. This does also allow to make the sending
of the "beep" control sequence depend on the validity of its parameters.

I have left the redundant assignment of 0 to the now initialized variables
in place since this makes the code simpler to understand and does not add
any run-time overhead (the compiler completely removes the "else if" test
and the assignments).

There was an embedded literal escape character in a string, which messes up
diplaying the source code on a terminal that interprets ANSI sequences. The
literal escape has been replaced by \e (non-standard, but supported by all
relevant compilers, and already used in other source files in base).

MFC after:	2 weeks
This commit is contained in:
Stefan Eßer 2019-01-23 10:05:27 +00:00
parent d65e72a818
commit 96329ce7e2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/kbdcontrol/kbdcontrol.c
View File

@ -961,6 +961,8 @@ set_bell_values(char *opt)
int bell, duration, pitch;
bell = 0;
duration = 0;
pitch = 0;
if (!strncmp(opt, "quiet.", 6)) {
bell = CONS_QUIET_BELL;
opt += 6;
@ -991,8 +993,8 @@ set_bell_values(char *opt)
}
ioctl(0, CONS_BELLTYPE, &bell);
if (!(bell & CONS_VISUAL_BELL))
fprintf(stderr, "[=%d;%dB", pitch, duration);
if (duration > 0 && pitch > 0)
fprintf(stderr, "\e[=%d;%dB", pitch, duration);
}
static void