summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2019-04-03 10:21:06 -0700
committerJohn Levon <john.levon@joyent.com>2019-04-09 10:26:29 -0700
commita8cc26d68f694b12e371adde16b203d5bad9f9a2 (patch)
tree9e2816ea119b611fb5a42825a0894500c5a1c1c3
parent640abd28701e4370024630347e96eb61db782c91 (diff)
downloadillumos-joyent-a8cc26d68f694b12e371adde16b203d5bad9f9a2.tar.gz
10685 SMB code needs smatch fixes
Reviewed by: Gergő Doma <domag02@gmail.com> Reviewed by: Gordon Ross <gwr@nexenta.com> Approved by: Gordon Ross <gwr@nexenta.com>
-rw-r--r--usr/src/cmd/dfs.cmds/sharemgr/commands.c3
-rw-r--r--usr/src/cmd/fs.d/smbclnt/fksmbcl/Makefile4
-rw-r--r--usr/src/lib/smbclnt/libfknsmb/Makefile.com5
-rw-r--r--usr/src/lib/smbclnt/libfksmbfs/Makefile.com5
4 files changed, 16 insertions, 1 deletions
diff --git a/usr/src/cmd/dfs.cmds/sharemgr/commands.c b/usr/src/cmd/dfs.cmds/sharemgr/commands.c
index f8cbecf01a..d6f9ad8611 100644
--- a/usr/src/cmd/dfs.cmds/sharemgr/commands.c
+++ b/usr/src/cmd/dfs.cmds/sharemgr/commands.c
@@ -23,6 +23,7 @@
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
* Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright 2019, Joyent, Inc.
*/
#include <sys/types.h>
@@ -1770,7 +1771,7 @@ sa_list(sa_handle_t handle, int flags, int argc, char *argv[])
}
(void) printf(gettext("usage: %s\n"),
sa_get_usage(USAGE_LIST));
- return (ret);
+ return (ret);
}
}
diff --git a/usr/src/cmd/fs.d/smbclnt/fksmbcl/Makefile b/usr/src/cmd/fs.d/smbclnt/fksmbcl/Makefile
index 5ae4f56e1b..b40f50aeea 100644
--- a/usr/src/cmd/fs.d/smbclnt/fksmbcl/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/fksmbcl/Makefile
@@ -21,6 +21,7 @@
#
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2017 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2019, Joyent, Inc.
#
PROG= fksmbcl
@@ -68,6 +69,9 @@ CPPFLAGS += -DFKSMBCL
# Always want DEBUG here
CPPFLAGS += -DDEBUG
+# needs work
+SMOFF += all_func_returns
+
CSTD= $(CSTD_GNU99)
CFLAGS += $(CCVERBOSE)
diff --git a/usr/src/lib/smbclnt/libfknsmb/Makefile.com b/usr/src/lib/smbclnt/libfknsmb/Makefile.com
index 01da52d337..c2c7dcc973 100644
--- a/usr/src/lib/smbclnt/libfknsmb/Makefile.com
+++ b/usr/src/lib/smbclnt/libfknsmb/Makefile.com
@@ -24,6 +24,8 @@
#
# Copyright 2018 Nexenta Systems, Inc. All rights reserved.
#
+# Copyright 2019, Joyent, Inc.
+#
LIBRARY = libfknsmb.a
VERS = .1
@@ -90,6 +92,9 @@ CPPFLAGS += -DDEBUG
CERRWARN += -_gcc=-Wno-switch
+# needs work
+SMOFF += all_func_returns,deref_check,signed
+
LDLIBS += $(MACH_LDLIBS)
LDLIBS += -lfakekernel -lpkcs11 -lnsl -lc
diff --git a/usr/src/lib/smbclnt/libfksmbfs/Makefile.com b/usr/src/lib/smbclnt/libfksmbfs/Makefile.com
index abc12a9464..88257e65b6 100644
--- a/usr/src/lib/smbclnt/libfksmbfs/Makefile.com
+++ b/usr/src/lib/smbclnt/libfksmbfs/Makefile.com
@@ -24,6 +24,8 @@
#
# Copyright 2018 Nexenta Systems, Inc. All rights reserved.
#
+# Copyright 2019, Joyent, Inc.
+#
LIBRARY = libfksmbfs.a
VERS = .1
@@ -104,6 +106,9 @@ CPPFLAGS += -DDEBUG
CERRWARN += -_gcc=-Wno-switch
CERRWARN += -_gcc=-Wno-parentheses
+# needs work
+SMOFF += all_func_returns,deref_check,signed,or_vs_and
+
LDLIBS += $(MACH_LDLIBS)
LDLIBS += -lfknsmb -lfakekernel -lidmap -lcmdutils -lavl -lc