OS-8323 Get the lint out of varpd & libvarpd

Reviewed by: Brian Bennett <brian.bennett@joyent.com>
Approved by: Brian Bennett <brian.bennett@joyent.com>

10 files changed, 13 insertions, 37 deletions

diff --git a/usr/src/cmd/varpd/Makefile b/usr/src/cmd/varpd/Makefile
index ea37ac6f71..ceb719f256 100644
--- a/usr/src/cmd/varpd/Makefile
+++ b/usr/src/cmd/varpd/Makefile
@@ -32,11 +32,6 @@ CFLAGS += $(CCVERBOSE)
 LDLIBS += -lvarpd -lumem -lscf
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 
-#
-# Our debug only umem related functions cause lint to get confused.
-#
-LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
-
 C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
 
@@ -51,8 +46,6 @@ $(PROG): $(OBJS)
 clean:
 	-$(RM) $(CLEANFILES)
 
-lint: lint_PROG
-
 %.o: ../%.c
 	$(COMPILE.c) $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/lib/varpd/Makefile b/usr/src/lib/varpd/Makefile
index a0e4537ab9..7c78fb3145 100644
--- a/usr/src/lib/varpd/Makefile
+++ b/usr/src/lib/varpd/Makefile
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2018 Joyent, Inc.
+# Copyright 2021 Joyent, Inc.
 #
 
 SUBDIRS = libvarpd direct files svp
@@ -21,11 +21,10 @@ clobber :=	TARGET = clobber
 check :=	TARGET = check
 install :=	TARGET = install
 install_h :=	TARGET = install_h
-lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install install_h check lint: $(SUBDIRS)
+all clean clobber install install_h check: $(SUBDIRS)
 direct files svp: libvarpd
 
 $(SUBDIRS):  FRC
diff --git a/usr/src/lib/varpd/direct/Makefile b/usr/src/lib/varpd/direct/Makefile
index 275f07bf8b..511ea1f94d 100644
--- a/usr/src/lib/varpd/direct/Makefile
+++ b/usr/src/lib/varpd/direct/Makefile
@@ -22,11 +22,10 @@ all :=		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
 install :=	TARGET = install
-lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install_h:
 
diff --git a/usr/src/lib/varpd/direct/Makefile.com b/usr/src/lib/varpd/direct/Makefile.com
index c9baf53cd4..2987d2a260 100644
--- a/usr/src/lib/varpd/direct/Makefile.com
+++ b/usr/src/lib/varpd/direct/Makefile.com
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2020 Joyent, Inc.
+# Copyright 2021 Joyent, Inc.
 #
 
 LIBRARY =	libvarpd_direct.a
@@ -33,6 +33,4 @@ SRCDIR =	../common
 
 all:	$(LIBS)
 
-lint:	lintcheck
-
 include ../../../Makefile.targ
diff --git a/usr/src/lib/varpd/files/Makefile b/usr/src/lib/varpd/files/Makefile
index 275f07bf8b..6253d3c242 100644
--- a/usr/src/lib/varpd/files/Makefile
+++ b/usr/src/lib/varpd/files/Makefile
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2015 Joyent, Inc.
+# Copyright 2021 Joyent, Inc.
 #
 
 include		../../Makefile.lib
@@ -22,11 +22,10 @@ all :=		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
 install :=	TARGET = install
-lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install_h:
 
diff --git a/usr/src/lib/varpd/files/Makefile.com b/usr/src/lib/varpd/files/Makefile.com
index dd8009d002..815f883ea2 100644
--- a/usr/src/lib/varpd/files/Makefile.com
+++ b/usr/src/lib/varpd/files/Makefile.com
@@ -37,6 +37,4 @@ SRCDIR =	../common
 
 all:	$(LIBS)
 
-lint:	lintcheck
-
 include ../../../Makefile.targ
diff --git a/usr/src/lib/varpd/libvarpd/Makefile b/usr/src/lib/varpd/libvarpd/Makefile
index 2a4f8f070c..2dbc8d7c5d 100644
--- a/usr/src/lib/varpd/libvarpd/Makefile
+++ b/usr/src/lib/varpd/libvarpd/Makefile
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2015 Joyent, Inc.
+# Copyright 2021 Joyent, Inc.
 #
 
 include		../../Makefile.lib
@@ -35,15 +35,14 @@ all :=		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
 install :=	TARGET = install
-lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber lint: $(SUBDIRS)
+all clean clobber: $(SUBDIRS)
 
-install: 	$(SUBDIRS) $(VARPD_MAPFILES) install_h
+install:	$(SUBDIRS) $(VARPD_MAPFILES) install_h
 
-install_h: 	$(ROOTHDRS)
+install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS) $(TYPECHECK)
 
diff --git a/usr/src/lib/varpd/libvarpd/Makefile.com b/usr/src/lib/varpd/libvarpd/Makefile.com
index 1521f83f8f..67f824f7b2 100644
--- a/usr/src/lib/varpd/libvarpd/Makefile.com
+++ b/usr/src/lib/varpd/libvarpd/Makefile.com
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2015 Joyent, Inc.
+# Copyright 2021 Joyent, Inc.
 #
 
 LIBRARY =	libvarpd.a
@@ -28,16 +28,12 @@ OBJECTS =	libvarpd.o \
 
 include ../../../Makefile.lib
 
-LIBS =		$(DYNLIB) $(LINTLIB)
+LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lavl -lumem -lidspace -lnvpair -lmd5 -lrename \
 		-lbunyan
 CPPFLAGS +=	-I../common
 
 CERRWARN +=	-erroff=E_STRUCT_DERIVED_FROM_FLEX_MBR
-LINTFLAGS +=	-erroff=E_STRUCT_DERIVED_FROM_FLEX_MBR \
-		-erroff=E_BAD_PTR_CAST_ALIGN
-LINTFLAGS64  +=	-erroff=E_STRUCT_DERIVED_FROM_FLEX_MBR \
-		-erroff=E_BAD_PTR_CAST_ALIGN
 
 C99MODE=	-xc99=%all
 C99LMODE=	-Xc99=%all
@@ -48,6 +44,4 @@ SRCDIR =	../common
 
 all:	$(LIBS)
 
-lint:	lintcheck
-
 include ../../../Makefile.targ
diff --git a/usr/src/lib/varpd/svp/Makefile b/usr/src/lib/varpd/svp/Makefile
index b4dbf8f017..48417965b4 100644
--- a/usr/src/lib/varpd/svp/Makefile
+++ b/usr/src/lib/varpd/svp/Makefile
@@ -24,11 +24,10 @@ all :=		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
 install :=	TARGET = install
-lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install:	install_h
 install_h:	$(ROOTHDRS)
diff --git a/usr/src/lib/varpd/svp/Makefile.com b/usr/src/lib/varpd/svp/Makefile.com
index d5e6d73144..91baacb430 100644
--- a/usr/src/lib/varpd/svp/Makefile.com
+++ b/usr/src/lib/varpd/svp/Makefile.com
@@ -49,6 +49,4 @@ C99LMODE=	-Xc99=%all
 
 all:	$(LIBS)
 
-lint:	lintcheck
-
 include ../../../Makefile.targ