From: Kurt Zeilenga Date: Wed, 15 Sep 1999 21:01:24 +0000 (+0000) Subject: Use ptrdiff_t and initial default_referral to NULL. X-Git-Tag: OPENLDAP_REL_ENG_1_2_8~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ae0d68dafc27a177ea1f9d8940ddc21d4754fc;p=thirdparty%2Fopenldap.git 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 881147d1c8..500da051a2 100644 --- 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 2399274e3d..bc0f2de4da 100644 --- 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 c536f9c646..af83ef7801 100644 --- 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;