Small tidyups for gcc in 'preen' mode....

Jeremy.
(This used to be commit 60dc1a4a00a22088d33369588b0d5eb292cf084a)

diff --git a/source3/lib/getsmbpass.c b/source3/lib/getsmbpass.c
index 7e544fa8d0760f966a460475d804b858a758aab2..0874529d325962bc79a32bc2496e3db2c76371e0 100644 (file)
--- a/source3/lib/getsmbpass.c
+++ b/source3/lib/getsmbpass.c
@@ -151,6 +151,6 @@ char *getsmbpass(char *prompt)
 }
 
 #else
-
+ void getsmbpasswd_dummy(void);
  void getsmbpasswd_dummy(void) {;}
 #endif

diff --git a/source3/lib/netmask.c b/source3/lib/netmask.c
index d9bc06c47a9432d83ae74c50371959545138e3d3..6d710583758689f2391a5437ddf5e3a7b8317ff3 100644 (file)
--- a/source3/lib/netmask.c
+++ b/source3/lib/netmask.c
@@ -51,6 +51,11 @@
 #include <sys/sockio.h>
 #endif
 
+/*
+ * Prototype for gcc in fussy mode.
+ */
+
+int get_netmask(struct in_addr *ipaddr, struct in_addr *nmask);
 
 /****************************************************************************
   get the netmask address for a local interface

diff --git a/source3/lib/replace.c b/source3/lib/replace.c
index 948dfdf9c88b0de57622ca287f1823c801cb6456..a354458a686b587d3917220d102620b4820705b6 100644 (file)
--- a/source3/lib/replace.c
+++ b/source3/lib/replace.c
@@ -23,9 +23,8 @@
 
 extern int DEBUGLEVEL;
 
-
- void replace_dummy(void) 
-{}
+ void replace_dummy(void);
+ void replace_dummy(void) {}
 
 
 #ifndef HAVE_FTRUNCATE

diff --git a/source3/lib/ufc.c b/source3/lib/ufc.c
index f464953498e06a90574d4827e72fa914a2d056c0..86cb41a10c75b47dbd7b2aa4ada4afe5eaccafd9 100644 (file)
--- a/source3/lib/ufc.c
+++ b/source3/lib/ufc.c
@@ -778,6 +778,6 @@ static ufc_long *_ufc_doit(l1, l2, r1, r2, itr)
 
 
 #else
- int ufc_dummy_procedure(void)
-{return 0;}
+ int ufc_dummy_procedure(void);
+ int ufc_dummy_procedure(void) {return 0;}
 #endif

diff --git a/source3/libsmb/smbdes.c b/source3/libsmb/smbdes.c
index 46b337cda88921c2dd995516a9dbe8a1c1f4f17f..9d531ef26dd4f8517125d3ba2ba944cdbd56f626 100644 (file)
--- a/source3/libsmb/smbdes.c
+++ b/source3/libsmb/smbdes.c
@@ -22,6 +22,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "includes.h"
 
 /* NOTES: 
 

diff --git a/source3/locking/locking_slow.c b/source3/locking/locking_slow.c
index fd95fd45ec209d81cf5fd629c825bf6100d012be..f2c2d3e9d9a8201b59c111157ae6fd59ed8d3ba7 100644 (file)
--- a/source3/locking/locking_slow.c
+++ b/source3/locking/locking_slow.c
@@ -1071,6 +1071,6 @@ struct share_ops *locking_slow_init(int ronly)
        return &share_ops;
 }
 #else
- int locking_slow_dummy_procedure(void)
-{return 0;}
+ int locking_slow_dummy_procedure(void);
+ int locking_slow_dummy_procedure(void) {return 0;}
 #endif /* !FAST_SHARE_MODES */

diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c
index 59c6cd3d4ff1f358b81a3ff48222d44058f2905e..59b06d7e6fed23f146b0bb8b4ea89f1b0a84d23a 100644 (file)
--- a/source3/passdb/ldap.c
+++ b/source3/passdb/ldap.c
@@ -993,5 +993,6 @@ struct passdb_ops *ldap_initialize_password_db(void)
 }
 
 #else
+ void dummy_function(void);
  void dummy_function(void) { } /* stop some compilers complaining */
 #endif

diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c
index 4a2a7723d643e4756956d23418c4e3f07d14e3b8..32cf42f95ba208227fc0fd780f5700bdcbc2b091 100644 (file)
--- a/source3/passdb/nispass.c
+++ b/source3/passdb/nispass.c
@@ -673,6 +673,7 @@ struct passdb_ops *nisplus_initialize_password_db(void)
 }
  
 #else
+ void nisplus_dummy_function(void);
  void nisplus_dummy_function(void) { } /* stop some compilers complaining */
 #endif /* WITH_NISPLUS */
 

diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c
index 1f9f75a4fa7f6441465c67160ab96dec449c1d28..5c5eebeb5028c193c59661af4fe5cddb2a6aec15 100644 (file)
--- a/source3/printing/print_svid.c
+++ b/source3/printing/print_svid.c
@@ -117,5 +117,6 @@ int sysv_printername_ok(char *name)
 
 #else
 /* this keeps fussy compilers happy */
+ void print_svid_dummy(void);
  void print_svid_dummy(void) {}
 #endif

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 0fe248068e4a7d06d501667668fe492ad002ba20..f252c99d9762a651bdb06bf610a2fab7223cb4c0 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -585,7 +585,7 @@ BOOL rpc_api_pipe_req(struct cli_state *cli, uint8 op_num,
        BOOL ret;
        BOOL auth_verify;
        BOOL auth_seal;
-       uint32 crc32;
+       uint32 crc32 = 0;
 
        auth_verify = IS_BITS_SET_ALL(cli->ntlmssp_srv_flgs, NTLMSSP_NEGOTIATE_SIGN);
        auth_seal   = IS_BITS_SET_ALL(cli->ntlmssp_srv_flgs, NTLMSSP_NEGOTIATE_SEAL);

diff --git a/source3/rpc_server/srv_ldap_helpers.c b/source3/rpc_server/srv_ldap_helpers.c
index fb2442789c81021b55f0430e7455f95167bfced0..4db841990e91552b3b4a401e332e08239da18376 100644 (file)
--- a/source3/rpc_server/srv_ldap_helpers.c
+++ b/source3/rpc_server/srv_ldap_helpers.c
@@ -9,6 +9,6 @@ extern int DEBUGLEVEL;
 
 #else /* USE_LDAP */
 /* this keeps fussy compilers happy */
-void ldap_helper_dummy(void)
-{}
+ void ldap_helper_dummy(void);
+ void ldap_helper_dummy(void) {}
 #endif /* USE_LDAP */

diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index b7a538e189ec513ca5f989fede4cb715baaaccea..716c2357c6c21fee8b6d160a7789371c8be5cb0f 100644 (file)
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -661,6 +661,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize)
 
 #else
 /* this keeps fussy compilers happy */
+ void quotas_dummy(void);
  void quotas_dummy(void) {}
 #endif /* QUOTAS */
 

diff --git a/source3/smbd/ssl.c b/source3/smbd/ssl.c
index 27bb8f3a525bebc66421e21ba6acea7cc29f0ed4..1c953272c3bc4716c3001fa20ac16b56a14edcfe 100644 (file)
--- a/source3/smbd/ssl.c
+++ b/source3/smbd/ssl.c
@@ -261,5 +261,6 @@ char            *reqHosts, *resignHosts;
 }
 
 #else /* WITH_SSL */
+ void ssl_dummy(void);
  void ssl_dummy(void) {;} /* So some compilers don't complain. */
 #endif  /* WITH_SSL */

diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c
index 76cd92e607e02ea45d140bddf094fc2df864fbcd..0d713da7978c2bd685850fdae4062935a0771f1c 100644 (file)
--- a/source3/smbwrapper/smbw.c
+++ b/source3/smbwrapper/smbw.c
@@ -1417,6 +1417,10 @@ struct kernel_stat {
        unsigned long int __unused5;
 };
 
+/*
+ * Prototype for gcc in 'fussy' mode.
+ */
+ void xstat_convert(int vers, struct stat *st, struct kernel_stat *kbuf);
  void xstat_convert(int vers, struct stat *st, struct kernel_stat *kbuf)
 {
 #ifdef _STAT_VER_LINUX_OLD