The branch, master has been updated via 177df3c s3: Fix a shadowed declaration warning via 67fa593 s3: Include prctl where it is actually used via da8d36c s3: Attempt to fix the build on FreeBSD from cfa8b36 s3: Fix Coverity ID 2201, NULL_RETURNS
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 177df3c25b455d616e922853eef3d52dae739077 Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 23 17:27:57 2011 +0100 s3: Fix a shadowed declaration warning Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Wed Mar 23 17:19:01 CET 2011 on sn-devel-104 commit 67fa593aded2e84829217de42ab4d3a0c766fe4a Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 23 17:27:21 2011 +0100 s3: Include prctl where it is actually used commit da8d36ce9699e1ea7fbc17b731e2b458c1795f5b Author: Volker Lendecke <v...@samba.org> Date: Wed Mar 23 17:24:25 2011 +0100 s3: Attempt to fix the build on FreeBSD ----------------------------------------------------------------------- Summary of changes: source3/lib/dumpcore.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/dumpcore.c b/source3/lib/dumpcore.c index 8a1c43a..59a8912 100644 --- a/source3/lib/dumpcore.c +++ b/source3/lib/dumpcore.c @@ -27,6 +27,14 @@ #include "includes.h" +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif + +#ifdef HAVE_SYS_PRCTL_H +#include <sys/prctl.h> +#endif + static char *corepath; /** @@ -210,13 +218,13 @@ static char *get_corepath(const char *logbase, const char *progname) make all the preparations to safely dump a core file ********************************************************************/ -void dump_core_setup(const char *progname, const char *logfile) +void dump_core_setup(const char *progname, const char *log_file) { char *logbase = NULL; char *end = NULL; - if (logfile && *logfile) { - if (asprintf(&logbase, "%s", logfile) < 0) { + if (log_file && *log_file) { + if (asprintf(&logbase, "%s", log_file) < 0) { return; } if ((end = strrchr_m(logbase, '/'))) { -- Samba Shared Repository