silence warnings; fix messages

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index a2e43e0db9545dd2142a3d407a998d8adec30904..ab0cec701cae25978bcb42362e81f40579b4940f 100644 (file)
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -45,6 +45,7 @@ static int    bdb_cache_delete_entry_internal(Cache *cache, Entry *e);
 static void    bdb_lru_print(Cache *cache);
 #endif
 
+#if 0  /* unused */
 static int
 bdb_cache_entry_rdwr_lock(Entry *e, int rw)
 {
@@ -98,6 +99,7 @@ bdb_cache_entry_rdwr_unlock(Entry *e, int rw)
        else
                return ldap_pvt_thread_rdwr_runlock(&BEI(e)->bei_rdwr);
 }
+#endif /* unused */
 
 static int
 bdb_cache_entry_rdwr_init(Entry *e)

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index f5aee6dedb8aa7a3666c5e4dcb0301f63678bf65..90f99672f38a5cc71f6ce3a5b9baf5649f577f65 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -126,7 +126,7 @@ bdb_db_config(
                if( rc != LDAP_SUCCESS ) return 1;
 
        /* size of the cache in entries */
-         } else if ( strcasecmp( argv[0], "cachesize" ) == 0 ) {
+        } else if ( strcasecmp( argv[0], "cachesize" ) == 0 ) {
                  if ( argc < 2 ) {
                          fprintf( stderr,
                  "%s: line %d: missing size in \"cachesize <size>\" line\n",

diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c
index ecc856cb0e41bc01bc7a02a702991b3ec2432aba..e450a7c9c793f54ea1660106f95cea31b5d6cba9 100644 (file)
--- a/servers/slapd/back-bdb/idl.c
+++ b/servers/slapd/back-bdb/idl.c
@@ -185,6 +185,7 @@ int bdb_idl_insert( ID *ids, ID id )
        return 0;
 }
 
+#if 0  /* unused */
 static int idl_delete( ID *ids, ID id )
 {
        unsigned x = bdb_idl_search( ids, id );
@@ -228,6 +229,7 @@ static int idl_delete( ID *ids, ID id )
 
        return 0;
 }
+#endif /* unused */
 
 static char *
 bdb_show_key(

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index e8646d38961472649194554179eb2e5e32d71e6e..ccfc59edb936f7d9f1f97bf77c8773fba55ae627 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -37,13 +37,13 @@ struct berval bdb_uuid = { 0, NULL };
 typedef void * db_malloc(size_t);
 typedef void * db_realloc(void *, size_t);
 
+#if 0
 static int
 bdb_open( BackendInfo *bi )
 {
        return 0;
 }
 
-#if 0
 static int
 bdb_destroy( BackendInfo *bi )
 {
@@ -516,7 +516,7 @@ bdb_initialize(
 #ifdef NEW_LOGGING
        LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_initialize\n", 0, 0, 0 );
 #else
-       Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n",
+       Debug( LDAP_DEBUG_TRACE, "bdb_initialize: initialize BDB backend\n",
                0, 0, 0 );
 #endif
 
@@ -545,7 +545,7 @@ bdb_initialize(
                                "\texpected: %s \tgot: %s\n", DB_VERSION_STRING, version, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
-                               "bdb_open: version mismatch\n"
+                               "bdb_initialize: version mismatch\n"
                                "\texpected: " DB_VERSION_STRING "\n"
                                "\tgot: %s \n", version, 0, 0 );
 #endif
@@ -553,9 +553,9 @@ bdb_initialize(
 
 #ifdef NEW_LOGGING
                LDAP_LOG( BACK_BDB, DETAIL1, 
-                       "bdb_db_initialize: bdb_open: %s\n", version, 0, 0 );
+                       "bdb_db_initialize: %s\n", version, 0, 0 );
 #else
-               Debug( LDAP_DEBUG_ANY, "bdb_open: %s\n",
+               Debug( LDAP_DEBUG_ANY, "bdb_initialize: %s\n",
                        version, 0, 0 );
 #endif
        }