Fixes for NO_THREADS

[openldap] / servers / slapd / back-ldbm / dn2id.c

diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 152ab7a7e3952812d21c20c5fb67af789f7bfb0d..757d4b0f7170158f9ec78c8c7769dfa510b42666 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -30,8 +30,7 @@ dn2id_add(
        struct berval   ptr, pdn;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id_add: (%s):%ld\n", dn->bv_val, id ));
+       LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_add: (%s):%ld\n", dn->bv_val, id, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn->bv_val, id, 0 );
 #endif
@@ -41,8 +40,8 @@ dn2id_add(
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
            == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "dn2id_add: couldn't open/create dn2id%s\n", LDBM_SUFFIX ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                       "dn2id_add: couldn't open/create dn2id%s\n", LDBM_SUFFIX, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "Could not open/create dn2id%s\n",
                    LDBM_SUFFIX, 0, 0 );
@@ -104,8 +103,7 @@ dn2id_add(
        ldbm_cache_close( be, db );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id_add: return %d\n", rc ));
+       LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_add: return %d\n", rc, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_add %d\n", rc, 0, 0 );
 #endif
@@ -125,8 +123,7 @@ dn2id(
        Datum           key, data;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id: (%s)\n", dn->bv_val ));
+       LDAP_LOG( BACK_LDBM, ENTRY, "dn2id: (%s)\n", dn->bv_val, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
 #endif
@@ -136,8 +133,7 @@ dn2id(
        /* first check the cache */
        if ( (*idp = cache_find_entry_ndn2id( be, &li->li_cache, dn )) != NOID ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                          "dn2id: (%s)%ld in cache.\n", dn, *idp ));
+               LDAP_LOG( BACK_LDBM, DETAIL1, "dn2id: (%s)%ld in cache.\n", dn, *idp, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", *idp,
                        0, 0 );
@@ -149,8 +145,8 @@ dn2id(
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
                == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "dn2id: couldn't open dn2id%s\n", LDBM_SUFFIX ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                          "dn2id: couldn't open dn2id%s\n", LDBM_SUFFIX, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "<= dn2id could not open dn2id%s\n",
                        LDBM_SUFFIX, 0, 0 );
@@ -177,8 +173,7 @@ dn2id(
 
        if ( data.dptr == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                          "dn2id: (%s) NOID\n", dn ));
+               LDAP_LOG( BACK_LDBM, INFO, "dn2id: (%s) NOID\n", dn, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE, "<= dn2id NOID\n", 0, 0, 0 );
 #endif
@@ -194,8 +189,7 @@ dn2id(
        ldbm_datum_free( db->dbc_db, data );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id: %ld\n", *idp ));
+       LDAP_LOG( BACK_LDBM, ENTRY, "dn2id: %ld\n", *idp, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", *idp, 0, 0 );
 #endif
@@ -215,8 +209,7 @@ dn2idl(
        Datum           key;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2idl: \"%c%s\"\n", prefix, dn->bv_val ));
+       LDAP_LOG( BACK_LDBM, ENTRY, "dn2idl: \"%c%s\"\n", prefix, dn->bv_val, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn->bv_val, 0 );
 #endif
@@ -232,8 +225,8 @@ dn2idl(
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
                == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "dn2idl: could not open dn2id%s\n", LDBM_SUFFIX ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                          "dn2idl: could not open dn2id%s\n", LDBM_SUFFIX, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "<= dn2idl could not open dn2id%s\n",
                        LDBM_SUFFIX, 0, 0 );
@@ -272,8 +265,8 @@ dn2id_delete(
        struct berval   ptr, pdn;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id_delete: (%s)%ld\n", dn->bv_val, id ));
+       LDAP_LOG( BACK_LDBM, ENTRY, 
+                  "dn2id_delete: (%s)%ld\n", dn->bv_val, id, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn->bv_val, id, 0 );
 #endif
@@ -284,8 +277,8 @@ dn2id_delete(
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
            == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "dn2id_delete: couldn't open db2id%s\n", LDBM_SUFFIX ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                          "dn2id_delete: couldn't open db2id%s\n", LDBM_SUFFIX, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                    "<= dn2id_delete could not open dn2id%s\n", LDBM_SUFFIX,
@@ -342,8 +335,7 @@ dn2id_delete(
        ldbm_cache_close( be, db );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2id_delete: return %d\n", rc ));
+       LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_delete: return %d\n", rc, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
 #endif
@@ -369,9 +361,8 @@ dn2entry_rw(
        struct berval   pdn;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "dn2entry_rw: %s entry %s\n", rw ? "w" : "r",
-                  dn->bv_val ));
+       LDAP_LOG( BACK_LDBM, ENTRY, 
+                  "dn2entry_rw: %s entry %s\n", rw ? "w" : "r", dn->bv_val, 0 );
 #else
        Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
                rw ? "w" : "r", dn->bv_val, 0);
@@ -394,9 +385,9 @@ dn2entry_rw(
                }
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
-                          id, dn->bv_val ));
+               LDAP_LOG( BACK_LDBM, ERR, 
+                       "dn2entry_rw: no entry for valid id (%ld), dn (%s)\n", 
+                       id, dn->bv_val, 0 );
 #else
                Debug(LDAP_DEBUG_ANY,
                        "dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",