From e13aeea928dd89373cfaf3916c96f853c1227884 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 15 Aug 1998 01:19:26 +0000
Subject: configure: Changes for extra headers. configure.in: Source for header
 changes. client/clitar.c: Fixed isXXX macros & debugs for gcc pedantic
 compile. include/config.h.in: Added MEMSET, BZERO, MEMORY, RPCSVC_YPCLNT,
 STRINGS headers. include/includes.h: Headers for the above. include/smb.h:
 Made SIGNAL_CAST POSIX by default void (*)(int). lib/access.c: Fixed isXXX
 macros & debugs for gcc pedantic compile. lib/charset.c: Fixed isXXX macros &
 debugs for gcc pedantic compile. lib/debug.c: Fixed signal functs.
 lib/kanji.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 lib/smbrun.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 lib/util.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 libsmb/namequery.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 locking/shmem.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 locking/shmem_sysv.c: Fixed error messages in sysV stuff. nmbd/asyncdns.c:
 Fixed signal functs. nmbd/nmbd.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. passdb/passdb.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. passdb/smbpassfile.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. smbd/chgpasswd.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. smbd/ipc.c: Fixed isXXX macros & debugs for gcc pedantic
 compile. smbd/nttrans.c: Fixed fsp code path. smbd/password.c: fixed
 HAVE_YP_GET_DEFAULT_DOMAIN problem. smbd/printing.c: Fixed isXXX macros &
 debugs for gcc pedantic compile. smbd/reply.c: Fixed isXXX macros & debugs
 for gcc pedantic compile. smbd/server.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. smbd/trans2.c: Fixed core dump bug. smbd/uid.c: Fixed isXXX
 macros & debugs for gcc pedantic compile. Jeremy. (This used to be commit
 1b9cbcd02e575dc0a95fa589f720df30a4acc46b)

---
 source3/nmbd/asyncdns.c |  4 +---
 source3/nmbd/nmbd.c     | 12 ++++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'source3/nmbd')

diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c
index 89be2b0ce0..9926045d82 100644
--- a/source3/nmbd/asyncdns.c
+++ b/source3/nmbd/asyncdns.c
@@ -110,11 +110,9 @@ static void asyncdns_process(void)
   WINS db that our parent is going to write.
  **************************************************************************** */
 
-static int sig_term(void)
+static void sig_term(int sig)
 {
   _exit(0);
-  /* Keep compiler happy.. */
-  return 0;
 }
 
 /***************************************************************************
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 24f4951612..9eae3b0e98 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -61,7 +61,7 @@ extern struct in_addr ipzero;
 /**************************************************************************** **
   catch a sigterm
  **************************************************************************** */
-static int sig_term(void)
+static void sig_term(int sig)
 {
   BlockSignals(True,SIGTERM);
   
@@ -81,14 +81,12 @@ static int sig_term(void)
 
   exit(0);
 
-  /* Keep compiler happy.. */
-  return 0;
 } /* sig_term */
 
 /**************************************************************************** **
  catch a sighup
  **************************************************************************** */
-static int sig_hup(void)
+static void sig_hup(int sig)
 {
   BlockSignals( True, SIGHUP );
 
@@ -103,13 +101,12 @@ static int sig_hup(void)
 
   BlockSignals(False,SIGHUP);
 
-  return(0);
 } /* sig_hup */
 
 /**************************************************************************** **
  catch a sigpipe
  **************************************************************************** */
-static int sig_pipe(void)
+static void sig_pipe(int sig)
 {
   BlockSignals( True, SIGPIPE );
 
@@ -117,7 +114,6 @@ static int sig_pipe(void)
   if ( !is_daemon )
     exit(1);
   BlockSignals( False, SIGPIPE );
-  return(0);
 } /* sig_pipe */
 
 #if DUMP_CORE
@@ -147,7 +143,7 @@ static BOOL dump_core(void)
     rlp.rlim_cur = MAX( 4*1024*1024, rlp.rlim_cur );
     setrlimit( RLIMIT_CORE, &rlp );
     getrlimit( RLIMIT_CORE, &rlp );
-    DEBUG( 3, ( "Core limits now %d %d\n", rlp.rlim_cur, rlp.rlim_max ) );
+    DEBUG( 3, ( "Core limits now %d %d\n", (int)rlp.rlim_cur, (int)rlp.rlim_max ) );
   }
 #endif
 #endif
-- 
cgit