Fix most `wider type truncated to int' bugs on OSF1 due to implicit decls:

 #include <stdlib.h>    to get malloc & co various places,
 #include <ac/string.h> to get strlen & co in (liblutil/setproctitle.c),
 declare ch_malloc & co (slurp.h), avl_find_lin (avl.h), Malloc (ud/edit.c).
Also changed ch_malloc & co from char* to void* functions.

diff --git a/clients/fax500/main.c b/clients/fax500/main.c
index 61ff681f073b76c2dc4992af5676667c959ced92..7288e941a85253c3798393dac4e5fe19f2f5444e 100644 (file)
--- a/clients/fax500/main.c
+++ b/clients/fax500/main.c
@@ -13,6 +13,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <ac/socket.h>

diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index 0a117ce43207d87d0820e5855b44a546546bae66..ef0e90006a1b17a8ba51c75c06201db7873e2387 100644 (file)
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -13,6 +13,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <ac/string.h>

diff --git a/clients/ud/edit.c b/clients/ud/edit.c
index f8a094361a47aa040807ede7d46df4dd09a9ff64..a7e1d92e7209d510b1befced759533098872f061 100644 (file)
--- a/clients/ud/edit.c
+++ b/clients/ud/edit.c
@@ -26,6 +26,7 @@
 #include <ldap.h>
 #include <ldapconfig.h>
 #include "ud.h"
+extern void *Malloc();
 
 extern struct entry Entry; 
 extern int verbose;

diff --git a/include/avl.h b/include/avl.h
index eb8b8836fc82c24adaf928959edc0a726970c3fa..c9dc9b2a25eb0c6a1ed069f774c3b7254bed006b 100644 (file)
--- a/include/avl.h
+++ b/include/avl.h
@@ -57,6 +57,9 @@ avl_delete LDAP_P((Avlnode **, caddr_t, IFP));
 LDAP_F caddr_t
 avl_find LDAP_P((Avlnode *, caddr_t, IFP));
 
+LDAP_F caddr_t
+avl_find_lin LDAP_P((Avlnode *, caddr_t, IFP));
+
 LDAP_F caddr_t
 avl_getfirst LDAP_P((Avlnode *));
 

diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c
index 2761ec5e0b2b2c9d3d89b70184ef55d85766eed0..9c91a4153001b83d377198fe751be0724c293417 100644 (file)
--- a/libraries/libldif/line64.c
+++ b/libraries/libldif/line64.c
@@ -3,6 +3,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <ac/string.h>

diff --git a/libraries/liblutil/setproctitle.c b/libraries/liblutil/setproctitle.c
index b2a590b6121f9d9b83ae75c188ec9ac7bc619912..d0da848040168f3841b4819f50e409226092f281 100644 (file)
--- a/libraries/liblutil/setproctitle.c
+++ b/libraries/liblutil/setproctitle.c
@@ -3,6 +3,7 @@
 #ifndef HAVE_SETPROCTITLE
 
 #include <stdlib.h>
+#include <ac/string.h>
 
 #if defined( HAVE_STDARG_H ) && __STDC__
 #include <stdarg.h>

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 1aa239239588c557989755251035ce2f66bd9626..e4fa388fa99b6a0f32b66d89f7de0b70e2e2ffb9 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -22,7 +22,6 @@
 #include "slap.h"
 
 extern char    **charray_dup();
-extern char    *ch_malloc();
 extern int     errno;
 
 void

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 9839a542c19bb6e10994284659871ba3e2154749..6b73e802b72c16a04d304f9f02db77ab4ceeba3b 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -17,7 +17,6 @@ extern pthread_mutex_t        currenttime_mutex;
 extern IDList          *idl_alloc();
 extern Attribute       *attr_find();
 extern IDList          *filter_candidates();
-extern char            *ch_realloc();
 extern char            *dn_parent();
 
 static IDList  *base_candidates();

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 9ce0ed80ec8936c9ab3d80c701954616f59242c6..519720e238862417b221b7fcb5b288f995e2ae0e 100644 (file)
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -9,14 +9,14 @@
 
 #include "slap.h"
 
-char *
+void *
 ch_malloc(
     unsigned long      size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) malloc( size )) == NULL ) {
+       if ( (new = (void *) malloc( size )) == NULL ) {
                Debug( LDAP_DEBUG_ANY, "malloc of %d bytes failed\n", size, 0, 0 );
                exit( 1 );
        }
@@ -24,19 +24,19 @@ ch_malloc(
        return( new );
 }
 
-char *
+void *
 ch_realloc(
-    char               *block,
+    void               *block,
     unsigned long      size
 )
 {
-       char    *new;
+       void    *new;
 
        if ( block == NULL ) {
                return( ch_malloc( size ) );
        }
 
-       if ( (new = (char *) realloc( block, size )) == NULL ) {
+       if ( (new = (void *) realloc( block, size )) == NULL ) {
                Debug( LDAP_DEBUG_ANY, "realloc of %d bytes failed\n", size, 0, 0 );
                exit( 1 );
        }
@@ -44,15 +44,15 @@ ch_realloc(
        return( new );
 }
 
-char *
+void *
 ch_calloc(
     unsigned long      nelem,
     unsigned long      size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) calloc( nelem, size )) == NULL ) {
+       if ( (new = (void *) calloc( nelem, size )) == NULL ) {
                Debug( LDAP_DEBUG_ANY, "calloc of %d elems of %d bytes failed\n",
                  nelem, size, 0 );
                exit( 1 );

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index f408e6838301e923a0d42e58da13947deda45a71..4f76fa55b9742bb3f8d5c31aa915edbed5439637 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -13,8 +13,6 @@ static int    get_filter_list();
 static int     get_substring_filter();
 
 extern int     get_ava();
-extern char    *ch_malloc();
-extern char    *ch_realloc();
 
 int
 get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index a1f32ac54e23b26c74ec1d8afbb555e65fa3928b..ef402878e030bb0f57207de6702ce7fd9847691b 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -63,9 +63,9 @@ void be_close LDAP_P(());
  * ch_malloc.c
  */
 
-char * ch_malloc LDAP_P(( unsigned long size ));
-char * ch_realloc LDAP_P(( char *block, unsigned long size ));
-char * ch_calloc LDAP_P(( unsigned long nelem, unsigned long size ));
+void * ch_malloc LDAP_P(( unsigned long size ));
+void * ch_realloc LDAP_P(( void *block, unsigned long size ));
+void * ch_calloc LDAP_P(( unsigned long nelem, unsigned long size ));
 
 /*
  * charray.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 4450be586654bea2683ca1ae67143c6e6ae12490..d47d754f576608e77fe2e0be532518cc138f3971 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -18,7 +18,6 @@ extern char           *replogfile;
 
 extern FILE    *lock_fopen();
 extern int     lock_fclose();
-extern char    *ch_malloc();
 extern char    *entry2str();
 
 void
@@ -81,7 +80,7 @@ replog(
                                len = strlen( mods->mod_type );
                                len = LDIF_SIZE_NEEDED( len,
                                    mods->mod_bvalues[i]->bv_len ) + 1;
-                               buf = ch_malloc( len );
+                               buf = (char *) ch_malloc( len );
 
                                bufp = buf;
                                put_type_and_value( &bufp, mods->mod_type,

diff --git a/servers/slapd/tools/centipede.c b/servers/slapd/tools/centipede.c
index 266b26bad9e67ab3491b976f0d81d8d7bcba5be0..487dd70778ab1e0c6f16223b38bf8ab85feaef2c 100644 (file)
--- a/servers/slapd/tools/centipede.c
+++ b/servers/slapd/tools/centipede.c
@@ -3,6 +3,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/string.h>

diff --git a/servers/slapd/tools/chlog2replog.c b/servers/slapd/tools/chlog2replog.c
index 85a9433bab36f70d0639c50167e0eb1b39c63ad1..f76884643b7ab8b8566fb92a06c55ce3c3a7461a 100644 (file)
--- a/servers/slapd/tools/chlog2replog.c
+++ b/servers/slapd/tools/chlog2replog.c
@@ -34,7 +34,7 @@ static void de_t61();
 
 extern FILE *lock_fopen( char *, char *, FILE ** );
 extern int lock_fclose( FILE *, FILE * );
-extern char *ch_realloc( char *, unsigned long ); 
+extern void *ch_realloc( void *, unsigned long ); 
 
 short  ldap_dn_syntax;
 PS     rps;

diff --git a/servers/slapd/tools/ldif.c b/servers/slapd/tools/ldif.c
index 6f68b77d72172394aa6c520973c2f94815b03205..0668eddbcd0e80ebced57c4e1f2028bde9aa5b9d 100644 (file)
--- a/servers/slapd/tools/ldif.c
+++ b/servers/slapd/tools/ldif.c
@@ -1,6 +1,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <ac/string.h>
 #include <ac/socket.h>

diff --git a/servers/slurpd/ch_malloc.c b/servers/slurpd/ch_malloc.c
index d23bfbeb0107f9f332a124e82c99e17115507f7b..cf3b79c0b93b10ad4859f8a9f087a8c3818524c2 100644 (file)
--- a/servers/slurpd/ch_malloc.c
+++ b/servers/slurpd/ch_malloc.c
@@ -28,14 +28,14 @@
  * Just like malloc, except we check the returned value and exit
  * if anything goes wrong.
  */
-char *
+void *
 ch_malloc(
     unsigned long      size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) malloc( size )) == NULL ) {
+       if ( (new = (void *) malloc( size )) == NULL ) {
                fprintf( stderr, "malloc of %lu bytes failed\n", size );
                exit( 1 );
        }
@@ -50,19 +50,19 @@ ch_malloc(
  * Just like realloc, except we check the returned value and exit
  * if anything goes wrong.
  */
-char *
+void *
 ch_realloc(
-    char               *block,
+    void               *block,
     unsigned long      size
 )
 {
-       char    *new;
+       void    *new;
 
        if ( block == NULL ) {
                return( ch_malloc( size ) );
        }
 
-       if ( (new = (char *) realloc( block, size )) == NULL ) {
+       if ( (new = (void *) realloc( block, size )) == NULL ) {
                fprintf( stderr, "realloc of %lu bytes failed\n", size );
                exit( 1 );
        }
@@ -77,15 +77,15 @@ ch_realloc(
  * Just like calloc, except we check the returned value and exit
  * if anything goes wrong.
  */
-char *
+void *
 ch_calloc(
     unsigned long      nelem,
     unsigned long      size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) calloc( nelem, size )) == NULL ) {
+       if ( (new = (void *) calloc( nelem, size )) == NULL ) {
                fprintf( stderr, "calloc of %lu elems of %lu bytes failed\n",
                    nelem, size );
                exit( 1 );
@@ -100,7 +100,7 @@ ch_calloc(
  */
 void
 ch_free(
-    char *p
+    void *p
 )
 {
     if ( p != NULL ) {

diff --git a/servers/slurpd/globals.c b/servers/slurpd/globals.c
index 7e2c7081bf8b279b1066dd6d025d6c28578a3b20..ba13dd20004554f775899b9911e1d81771cf5157 100644 (file)
--- a/servers/slurpd/globals.c
+++ b/servers/slurpd/globals.c
@@ -17,6 +17,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "slurp.h"
 #include "globals.h"

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 29dddb55baee4e83bed7f08d2b532372c382c363..36ee80be892a49c1eea4853e5fa9f22dc65c70ba 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -47,9 +47,6 @@ static int do_bind LDAP_P(( Ri *, int * ));
 static int do_unbind LDAP_P(( Ri * ));
 
 
-/* External references */
-extern char *ch_malloc LDAP_P(( unsigned long ));
-
 static char *kattrs[] = {"kerberosName", NULL };
 static struct timeval kst = {30L, 0L};
 

diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c
index e2250c72a25ef019d793e727979181b1b3e7dfe9..f568f07df4b8d0cb26255bde40f87131df42998a 100644 (file)
--- a/servers/slurpd/re.c
+++ b/servers/slurpd/re.c
@@ -33,7 +33,6 @@
 
 /* externs */
 extern char *str_getline LDAP_P(( char **next ));
-extern void ch_free LDAP_P(( char *p ));
 
 /* Forward references */
 static Rh      *get_repl_hosts LDAP_P(( char *, int *, char ** ));

diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c
index 732f3cf5200fef2c56aeedc4b493150b200f9f24..b6b6004960a75e682efb791412c27df689f7cdd7 100644 (file)
--- a/servers/slurpd/replog.c
+++ b/servers/slurpd/replog.c
@@ -36,7 +36,6 @@
  * Externs
  */
 extern FILE *lock_fopen LDAP_P(( char *, char *, FILE ** ));
-extern char *ch_malloc LDAP_P(( unsigned long ));
 
 /*
  * Forward declarations

diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c
index 964410235a3d16bdb39ee5e40da8c5d40f7e7cd4..40aa0f9045f74dd28fc7af9313cd264e3d80fb91 100644 (file)
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -20,6 +20,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ac/signal.h>
 
 #include "slurp.h"

diff --git a/servers/slurpd/rq.c b/servers/slurpd/rq.c
index e34572797b1ed0535355abb914140ffe9dd10df2..783b15ba2d7536a2a58635cb72d44667b96210c0 100644 (file)
--- a/servers/slurpd/rq.c
+++ b/servers/slurpd/rq.c
@@ -34,6 +34,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "slurp.h"
 #include "globals.h"

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index f9e4ff567caa86986dad5b0996dc1aa63f125363..971fd485af2bbbba3ea6a9f19473f2890ef710e8 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -333,6 +333,13 @@ typedef struct tsl {
 } tsl_t;
 #endif /* HAVE_LWP */
 
+/* Public functions */
+
+/* In ch_malloc.c */
+void * ch_malloc       LDAP_P(( unsigned long size ));
+void * ch_realloc      LDAP_P(( void *block, unsigned long size ));
+void * ch_calloc       LDAP_P(( unsigned long nelem, unsigned long size ));
+void   ch_free         LDAP_P(( void *p ));
     
 
 /* 
@@ -345,4 +352,3 @@ extern int Re_init LDAP_P(( Re **re ));
 LDAP_END_DECL
 
 #endif /* _SLURPD_H_ */
-

diff --git a/servers/slurpd/st.c b/servers/slurpd/st.c
index db5035a1f45d40de058ca2be2bba7dd3443446b4..3d50e80ce4c19fe6187bafdfc04ca95d29b1736a 100644 (file)
--- a/servers/slurpd/st.c
+++ b/servers/slurpd/st.c
@@ -19,6 +19,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ac/string.h>
 #include <ac/unistd.h>