Use ptrdiff_t and initial default_referral to NULL.

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 881147d1c8bf1aac29babfe6ca13873e2b63949d..500da051a279750bedce8b65c6c90e4a199b9883 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -19,7 +19,7 @@ static ID_BLOCK       *subtree_candidates(Backend *be, Connection *conn, Operation *op
 
 #define MAKE_SPACE( n ) { \
        if ( rcur + n > rbuf + rmaxsize ) { \
-               int     offset = rcur - rbuf; \
+               ptrdiff_t offset = rcur - rbuf; \
                rbuf =  ch_realloc( rbuf, rmaxsize + GRABSIZE ); \
                rmaxsize += GRABSIZE; \
                rcur = rbuf + offset; \

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 2399274e3d13aa3901bcf9086cfb5e60278c6b5f..bc0f2de4da36bf19bcd5b554d2119f6933bb01ad 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -151,7 +151,7 @@ str2entry( char     *s )
 
 #define MAKE_SPACE( n )        { \
                while ( ecur + (n) > ebuf + emaxsize ) { \
-                       int     offset; \
+                       ptrdiff_t       offset; \
                        offset = (int) (ecur - ebuf); \
                        ebuf = (unsigned char *) ch_realloc( (char *) ebuf, \
                            emaxsize + GRABSIZE ); \

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index c536f9c64697f73ac681779ee8364fc8ce5c192e..af83ef7801b40939e93db71601cd3ac3a27b9bcf 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -24,7 +24,7 @@ int           ldap_syslog;
 #endif
 
 int            ldap_syslog_level = LOG_DEBUG;
-char           *default_referral;
+char           *default_referral = NULL;
 time_t         starttime;
 ldap_pvt_thread_t      listener_tid;
 int            g_argc;