Change 'unsigned long len' to ber_len_t in get_filter()

[openldap] / servers / slapd / back-bdb2 / cache.c

diff --git a/servers/slapd/back-bdb2/cache.c b/servers/slapd/back-bdb2/cache.c
index f1ce3cccc3d3c6fe36c29094303e6aa295b94862..33b9e15fb7830eab1872a831e0d87955f64dab06 100644 (file)
--- a/servers/slapd/back-bdb2/cache.c
+++ b/servers/slapd/back-bdb2/cache.c
@@ -25,8 +25,8 @@ struct ldbm_entry_info {
 #define CACHE_ENTRY_DELETED            3
 
        int             lei_refcnt;     /* # threads ref'ing this entry */
-       struct entry    *lei_lrunext;   /* for cache lru list */
-       struct entry    *lei_lruprev;
+       Entry   *lei_lrunext;   /* for cache lru list */
+       Entry   *lei_lruprev;
 };
 #define LEI(e) ((struct ldbm_entry_info *) ((e)->e_private))
 
@@ -106,24 +106,24 @@ bdb2i_cache_return_entry_rw( struct cache *cache, Entry *e, int rw )
        if ( LEI(e)->lei_lruprev != NULL ) { \
                LEI(LEI(e)->lei_lruprev)->lei_lrunext = LEI(e)->lei_lrunext; \
        } else { \
-               cache->c_lruhead = LEI(e)->lei_lrunext; \
+               (cache)->c_lruhead = LEI(e)->lei_lrunext; \
        } \
        if ( LEI(e)->lei_lrunext != NULL ) { \
                LEI(LEI(e)->lei_lrunext)->lei_lruprev = LEI(e)->lei_lruprev; \
        } else { \
-               cache->c_lrutail = LEI(e)->lei_lruprev; \
+               (cache)->c_lrutail = LEI(e)->lei_lruprev; \
        } \
 }
 
 #define LRU_ADD( cache, e ) { \
-       LEI(e)->lei_lrunext = cache->c_lruhead; \
+       LEI(e)->lei_lrunext = (cache)->c_lruhead; \
        if ( LEI(e)->lei_lrunext != NULL ) { \
-               LEI(LEI(e)->lei_lrunext)->lei_lruprev = e; \
+               LEI(LEI(e)->lei_lrunext)->lei_lruprev = (e); \
        } \
-       cache->c_lruhead = e; \
+       (cache)->c_lruhead = (e); \
        LEI(e)->lei_lruprev = NULL; \
-       if ( cache->c_lrutail == NULL ) { \
-               cache->c_lrutail = e; \
+       if ( (cache)->c_lrutail == NULL ) { \
+               (cache)->c_lrutail = (e); \
        } \
 }
 
@@ -358,7 +358,8 @@ bdb2i_cache_find_entry_dn2id(
        int             count = 0;
 
        e.e_dn = dn;
-       e.e_ndn = dn_normalize_case( ch_strdup( dn ) );
+       e.e_ndn = ch_strdup( dn );
+       (void) dn_normalize_case( e.e_ndn );
 
 try_again:
        /* set cache mutex */