Skip to content

Fightwarn - find uses for unused variables #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 5 commits into from
Nov 11, 2020
Merged

Fightwarn - find uses for unused variables #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f07ebf5
clients/upsset.c: print_rw(): find use for upsname
jimklimov Nov 4, 2020
bf23ba9
clients/upsmon.c: sigpipe(): find use for sig
jimklimov Nov 4, 2020
dca2315
clients/upssched.c: main(): find use for argc
jimklimov Nov 4, 2020
e31c2b6
drivers/liebert-esp2.c: setvar(): find a use for "val"
jimklimov Nov 5, 2020
c1f622e
drivers/masterguard.c: StringSplit(): use the maxlen
jimklimov Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clients/upsmon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ static void loadconfig(void)
/* SIGPIPE handler */
static void sigpipe(int sig)
{
upsdebugx(1, "SIGPIPE: dazed and confused, but continuing...");
upsdebugx(1, "SIGPIPE: dazed and confused, but continuing after signal %i...", sig);
}

/* SIGQUIT, SIGTERM handler */
Expand Down
10 changes: 8 additions & 2 deletions clients/upssched.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,9 +908,15 @@ static void checkconf(void)

int main(int argc, char **argv)
{
const char *prog = xbasename(argv[0]);
const char *prog = NULL;
/* More a use for argc to avoid warnings than a real need: */
if (argc > 0) {
xbasename(argv[0]);
} else {
xbasename("upssched");
}

verbose = 1; /* TODO: remove when done testing */
verbose = 1; /* TODO: remove when done testing, or add -D */

/* normally we don't have stderr, so get this going to syslog early */
open_syslog(prog);
Expand Down
2 changes: 2 additions & 0 deletions clients/upsset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,8 @@ static void print_rw(const char *upsname, const char *varname)
{
const char *tmp;

printf("<!-- <TR><TD>Device</TD><TD>%s</TD></TR> -->\n", upsname);

printf("<TR BGCOLOR=\"#60B0B0\" ALIGN=\"CENTER\">\n");

printf("<TD>");
Expand Down
2 changes: 1 addition & 1 deletion drivers/liebert-esp2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ static int setvar(const char *varname, const char *val)
return STAT_SET_HANDLED;
}
*/
upslogx(LOG_NOTICE, "setvar: unknown variable [%s]", varname);
upslogx(LOG_NOTICE, "setvar: unknown variable [%s] [%s]", varname, val);
return STAT_SET_UNKNOWN;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/masterguard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static char *StringSplit( char *source, char *word, int maxlen )

word[0] = '\0';
len = strlen( source );
for( i = 0; i < len; i++ )
for( i = 0; i < len && wc < maxlen; i++ )
{
if( source[i] == ' ' )
{
Expand Down