From dd275afc077feb32ff64ecad34602e00803a5bca Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 5 Nov 2014 20:27:06 +0100 Subject: [PATCH 1/2] s3:smbstatus: fix return value in print_share_mode() Signed-off-by: Stefan Metzmacher --- source3/utils/status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/utils/status.c b/source3/utils/status.c index 936e87b7..978d3c5 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -123,7 +123,7 @@ static int print_share_mode(const struct share_mode_entry *e, static int count; if (do_checks && !is_valid_share_mode_entry(e)) { - return; + return 0; } if (count==0) { -- 1.9.1 From 8000663f10d6683c9b87385e33863dfc1f03d66e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 7 Nov 2014 09:36:16 +0100 Subject: [PATCH 2/2] wafsamba: add -Werror=return-type for developer builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids errors like this: ../source3/utils/status.c: In function ‘print_share_mode’: ../source3/utils/status.c:126:3: error: ‘return’ with no value, in function returning non-void [-Werror=return-type] return; Signed-off-by: Stefan Metzmacher --- buildtools/wafsamba/samba_autoconf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index f60ce9d..c193873 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -671,6 +671,8 @@ def SAMBA_CONFIG_H(conf, path=None): testflags=True) conf.ADD_CFLAGS('-Werror=declaration-after-statement -Wdeclaration-after-statement', testflags=True) + conf.ADD_CFLAGS('-Werror=return-type -Wreturn-type', + testflags=True) conf.ADD_CFLAGS('-Wformat=2 -Wno-format-y2k', testflags=True) # This check is because for ldb_search(), a NULL format string -- 1.9.1