From ecaa37affc4da0ba0f1331de875432d68cf70a80 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Fri, 24 Jan 2020 17:59:49 +0100 Subject: 12201 Enable smatch for zonestat and zonestatd Reviewed by: C Fraire Reviewed by: Toomas Soome Approved by: Dan McDonald --- usr/src/cmd/zonestat/zonestat/Makefile | 5 +---- usr/src/cmd/zonestat/zonestat/zonestat.c | 2 +- usr/src/cmd/zonestat/zonestatd/Makefile | 11 ++++------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/usr/src/cmd/zonestat/zonestat/Makefile b/usr/src/cmd/zonestat/zonestat/Makefile index a8b62f65d3..96bc8c5e5e 100644 --- a/usr/src/cmd/zonestat/zonestat/Makefile +++ b/usr/src/cmd/zonestat/zonestat/Makefile @@ -29,14 +29,11 @@ OBJS = $(SRCS:%.c=%.o) include ../../Makefile.cmd -LDLIBS += -lscf -lzonestat -lumem +LDLIBS += -lscf -lzonestat -lumem LINTFLAGS += -u CERRWARN += $(CNOWARN_UNINIT) -# not linted -SMATCH=off - .KEEP_STATE: .PARALLEL: diff --git a/usr/src/cmd/zonestat/zonestat/zonestat.c b/usr/src/cmd/zonestat/zonestat/zonestat.c index b66612ee10..fac6f97371 100644 --- a/usr/src/cmd/zonestat/zonestat/zonestat.c +++ b/usr/src/cmd/zonestat/zonestat/zonestat.c @@ -2358,7 +2358,7 @@ main(int argc, char *argv[]) } } - if (opt_line_any & (!opt_parseable)) { + if (opt_line_any && (!opt_parseable)) { (void) zonestat_error(gettext("-P requires -p")); return (zonestat_usage(B_FALSE)); } diff --git a/usr/src/cmd/zonestat/zonestatd/Makefile b/usr/src/cmd/zonestat/zonestatd/Makefile index 727c71148c..de4b2fc4b6 100644 --- a/usr/src/cmd/zonestat/zonestatd/Makefile +++ b/usr/src/cmd/zonestat/zonestatd/Makefile @@ -35,16 +35,13 @@ ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) SRCS = zonestatd.c CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -LDLIBS += -lkstat -lpool -lexacct -lscf \ +LDLIBS += -lkstat -lpool -lexacct -lscf \ -lcontract -lcmdutils -lumem LINTFLAGS += -u -CERRWARN += -_gcc=-Wno-parentheses -CERRWARN += -_gcc=-Wno-unused-label -CERRWARN += $(CNOWARN_UNINIT) - -# not linted -SMATCH=off +CERRWARN += -_gcc=-Wno-parentheses +CERRWARN += -_gcc=-Wno-unused-label +CERRWARN += $(CNOWARN_UNINIT) OBJS = $(SRCS:%.c=%.o) -- cgit v1.2.3 From 881f4659ab3a3d7bac3274ca7320c076fcd007de Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Sat, 25 Jan 2020 11:35:29 +0100 Subject: 12250 zonestat_usage(): stderr vs. stdio dilemma Reviewed by: Toomas Soome Reviewed by: Peter Tribble Reviewed by: Gergő Mihály Doma Approved by: Dan McDonald MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- usr/src/cmd/zonestat/zonestat/zonestat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/src/cmd/zonestat/zonestat/zonestat.c b/usr/src/cmd/zonestat/zonestat/zonestat.c index fac6f97371..358c31c4fa 100644 --- a/usr/src/cmd/zonestat/zonestat/zonestat.c +++ b/usr/src/cmd/zonestat/zonestat/zonestat.c @@ -292,7 +292,7 @@ zonestat_usage(boolean_t explicit) " Name of a zone using dedicated-cpu\n"), "-z", "-n", ZONESTAT_NAME_MEM_DEFAULT, ZONESTAT_NAME_VM_DEFAULT); - (void) printf(gettext( + (void) fprintf(fd, gettext( " %s Print timestamp. Valid timestamps are:\n" " \"%s\"\tDate as specifed by date(1) command\n" " \"%s\"\tUnix time as returned by time(2)\n" @@ -309,7 +309,7 @@ zonestat_usage(boolean_t explicit) ZONESTAT_NAME_HIGH, "-q", "-p"); - (void) printf(gettext( + (void) fprintf(fd, gettext( " %s Select desired lines in parseable output.\n" " \"%s\"\tLines describing each resource\n" " \"%s\"\tTotal usage of each resource\n" @@ -319,7 +319,7 @@ zonestat_usage(boolean_t explicit) "-P", ZONESTAT_NAME_RESOURCE, ZONESTAT_NAME_TOTAL, ZONESTAT_NAME_SYSTEM, ZONESTAT_NAME_ZONES, ZONESTAT_NAME_HEADER); - (void) printf(gettext( + (void) fprintf(fd, gettext( " %s Sort output by the specified columns:\n" " \"%s\"\tby name alphanumerically\n" " \"%s\"\tby percent of resource used\n" -- cgit v1.2.3