From 5661bb7641e85c46713da7a3002b29ecd2c3daf0 Mon Sep 17 00:00:00 2001 From: John Levon Date: Mon, 17 Dec 2018 23:44:05 +0000 Subject: 10080 smatch Makefile changes for usr/src/cmd Reviewed by: Andy Fiddaman Approved by: Robert Mustacchi --- usr/src/cmd/fm/eversholt/Makefile.esc.com | 4 +++- usr/src/cmd/fm/fmd/Makefile.fmd | 4 ++++ usr/src/cmd/fm/fmstat/Makefile.com | 3 +++ usr/src/cmd/fm/fmtopo/Makefile.com | 5 ++++- usr/src/cmd/fm/modules/common/disk-monitor/Makefile | 4 ++++ usr/src/cmd/fm/modules/common/eversholt/Makefile | 4 ++++ usr/src/cmd/fm/modules/common/fabric-xlate/Makefile | 4 ++++ usr/src/cmd/fm/modules/common/ip-transport/Makefile | 4 ++++ usr/src/cmd/fm/modules/common/ses-log-transport/Makefile | 5 ++++- 9 files changed, 34 insertions(+), 3 deletions(-) (limited to 'usr/src/cmd/fm') diff --git a/usr/src/cmd/fm/eversholt/Makefile.esc.com b/usr/src/cmd/fm/eversholt/Makefile.esc.com index d8dbaf289c..97d684c164 100644 --- a/usr/src/cmd/fm/eversholt/Makefile.esc.com +++ b/usr/src/cmd/fm/eversholt/Makefile.esc.com @@ -17,12 +17,12 @@ # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END -# # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Copyright 2018 RackTop Systems. +# Copyright (c) 2018, Joyent, Inc. # FMADIR = $(SRC)/cmd/fm @@ -51,6 +51,8 @@ CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch +SMOFF += all_func_returns + CTFCONVO = $(CTFCONVERT_O) CTFMRG = $(CTFMERGE) -L VERSION -o $@ $(OBJS) diff --git a/usr/src/cmd/fm/fmd/Makefile.fmd b/usr/src/cmd/fm/fmd/Makefile.fmd index 3634df1269..1a23743d95 100644 --- a/usr/src/cmd/fm/fmd/Makefile.fmd +++ b/usr/src/cmd/fm/fmd/Makefile.fmd @@ -21,6 +21,7 @@ # # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2015 RackTop Systems. +# Copyright (c) 2018, Joyent, Inc. # .KEEP_STATE: @@ -123,6 +124,9 @@ CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-clobbered +# not linted +SMATCH=off + $(PROG) := LDFLAGS += -R/usr/lib/fm $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo -ldiagcode -lsysevent -lsmbios \ -luuid -lnvpair -lexacct -lnsl -lumem -ldevinfo -lfmd_msg diff --git a/usr/src/cmd/fm/fmstat/Makefile.com b/usr/src/cmd/fm/fmstat/Makefile.com index 0c743f8108..97ab83a828 100644 --- a/usr/src/cmd/fm/fmstat/Makefile.com +++ b/usr/src/cmd/fm/fmstat/Makefile.com @@ -22,6 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2018, Joyent, Inc. .KEEP_STATE: .SUFFIXES: @@ -47,6 +48,8 @@ LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_adm LDFLAGS += -R/usr/lib/fm LINTFLAGS += -mnu +SMOFF += signed + .NO_PARALLEL: .PARALLEL: $(OBJS) $(LINTFILES) diff --git a/usr/src/cmd/fm/fmtopo/Makefile.com b/usr/src/cmd/fm/fmtopo/Makefile.com index 7b09bbbd87..d692d463aa 100644 --- a/usr/src/cmd/fm/fmtopo/Makefile.com +++ b/usr/src/cmd/fm/fmtopo/Makefile.com @@ -24,7 +24,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2018, Joyent, Inc. .KEEP_STATE: .SUFFIXES: @@ -45,6 +45,9 @@ LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo -lnvpair LDFLAGS += -R/usr/lib/fm LINTFLAGS += -mnu +# not linted +SMATCH=off + .NO_PARALLEL: .PARALLEL: $(OBJS) $(LINTFILES) diff --git a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile index 4ee7343d45..3acbf7c3df 100644 --- a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile +++ b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile @@ -22,6 +22,7 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2018, Joyent, Inc. MODULE = disk-monitor CLASS = common @@ -35,3 +36,6 @@ CFLAGS += -I. -I$(SRC)/lib/fm/topo/modules/common/disk LDLIBS += -lsysevent -lnvpair -lsmbios -lcfgadm -ltopo -luutil -lipmi LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm CERRWARN += -_gcc=-Wno-uninitialized + +# not linted +SMATCH=off diff --git a/usr/src/cmd/fm/modules/common/eversholt/Makefile b/usr/src/cmd/fm/modules/common/eversholt/Makefile index c71726062e..0ca385c960 100644 --- a/usr/src/cmd/fm/modules/common/eversholt/Makefile +++ b/usr/src/cmd/fm/modules/common/eversholt/Makefile @@ -25,6 +25,7 @@ # # eft.so (the eversholt DE) # +# Copyright (c) 2018, Joyent, Inc. .KEEP_STATE: @@ -49,6 +50,9 @@ CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-implicit-function-declaration +# not linted +SMATCH=off + $(PROG) := LDFLAGS += -R/usr/lib/fm $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo diff --git a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile index ef2fd7530d..ce58c99d73 100644 --- a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile +++ b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile @@ -22,6 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2018, Joyent, Inc. MODULE = fabric-xlate CLASS = common @@ -41,3 +42,6 @@ LDLIBS += -luutil -lxml2 -L$(ROOTLIB)/fm -ltopo CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized + +# not linted +SMATCH=off diff --git a/usr/src/cmd/fm/modules/common/ip-transport/Makefile b/usr/src/cmd/fm/modules/common/ip-transport/Makefile index 84f01180ab..bafe1caba3 100644 --- a/usr/src/cmd/fm/modules/common/ip-transport/Makefile +++ b/usr/src/cmd/fm/modules/common/ip-transport/Makefile @@ -24,6 +24,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2018, Joyent, Inc. MODULE = ip-transport CLASS = common @@ -33,3 +34,6 @@ include ../../Makefile.plugin LDLIBS += -lsocket -lnsl CERRWARN += -_gcc=-Wno-uninitialized + +# not linted +SMATCH=off diff --git a/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile b/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile index eac67a77f9..0188e38a35 100644 --- a/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile +++ b/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile @@ -21,8 +21,8 @@ # #Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# Copyright (c) 2018, Joyent, Inc. - MODULE = ses-log-transport CLASS = common SRCS = ses_log_transport.c @@ -33,3 +33,6 @@ CFLAGS += $(INCS) LINTFLAGS += $(INCS) LDLIBS += -L$(ROOTLIB)/fm -ltopo -lseslog LDFLAGS += -R/usr/lib/fm + +# not linted +SMATCH=off -- cgit v1.2.3