The branch, master has been updated
via e1324580391 tests: don't rely on implicit int return type
via f1b43dfe4a7 s3/lib: clean up have_syscall() formatting
via 45a202a197d s3/lib: don't rely on implicit int return type
from 232273bfac3 s4:torture: Enforce Printer Class
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e13245803918a90c3e4eb074579885888bfc9310
Author: David Disseldorp <[email protected]>
Date: Sun Jan 27 13:31:16 2019 +0100
tests: don't rely on implicit int return type
Signed-off-by: David Disseldorp <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): David Disseldorp <[email protected]>
Autobuild-Date(master): Tue Jan 29 03:47:27 CET 2019 on sn-devel-144
commit f1b43dfe4a75683d881811bd0830e38e16822d6a
Author: David Disseldorp <[email protected]>
Date: Sun Jan 27 00:41:28 2019 +0100
s3/lib: clean up have_syscall() formatting
Signed-off-by: David Disseldorp <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 45a202a197d7615a6285768545a691cfb05deb22
Author: David Disseldorp <[email protected]>
Date: Sun Jan 27 00:41:28 2019 +0100
s3/lib: don't rely on implicit int return type
C99 removed this behaviour.
Signed-off-by: David Disseldorp <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/util_sec.c | 7 ++++---
tests/ftruncate.c | 2 +-
tests/getgroups.c | 2 +-
tests/readlink.c | 2 +-
tests/shared_mmap.c | 2 +-
tests/trivial.c | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c
index 94082697def..974e458b06e 100644
--- a/source3/lib/util_sec.c
+++ b/source3/lib/util_sec.c
@@ -544,12 +544,13 @@ static int have_syscall(void)
samba_setuidx(ID_EFFECTIVE, -1);
#endif
- if (errno == ENOSYS) return -1;
-
+ if (errno == ENOSYS) {
+ return -1;
+ }
return 0;
}
-main()
+int main(void)
{
if (getuid() != 0) {
#if (defined(AIX) && defined(USE_SETREUID))
diff --git a/tests/ftruncate.c b/tests/ftruncate.c
index d3e5de3afbe..46123762ef7 100644
--- a/tests/ftruncate.c
+++ b/tests/ftruncate.c
@@ -11,7 +11,7 @@
#define DATA "conftest.trunc"
#define LEN 7663
-main()
+int main(void)
{
int *buf;
int fd = open(DATA,O_RDWR|O_CREAT|O_TRUNC,0666);
diff --git a/tests/getgroups.c b/tests/getgroups.c
index 343fd5a184f..ab5648030a8 100644
--- a/tests/getgroups.c
+++ b/tests/getgroups.c
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <grp.h>
-main()
+int main(void)
{
int i;
int *igroups;
diff --git a/tests/readlink.c b/tests/readlink.c
index 3784288ba01..65311c2ff79 100644
--- a/tests/readlink.c
+++ b/tests/readlink.c
@@ -11,7 +11,7 @@
#define DATA "readlink.test"
#define FNAME "rdlnk.file"
-main()
+int main(void)
{
char buf[7];
int ret;
diff --git a/tests/shared_mmap.c b/tests/shared_mmap.c
index 40d462302ef..5c32a66c299 100644
--- a/tests/shared_mmap.c
+++ b/tests/shared_mmap.c
@@ -15,7 +15,7 @@
#define MAP_FILE 0
#endif
-main()
+int main(void)
{
int *buf;
int i;
diff --git a/tests/trivial.c b/tests/trivial.c
index f7e96d8109c..a137c8c9727 100644
--- a/tests/trivial.c
+++ b/tests/trivial.c
@@ -1,7 +1,7 @@
void exit(int);
-main()
+int main(void)
{
exit(0);
}
--
Samba Shared Repository
