zap charray

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index f5829d395af02a3555138d88234b8df301b6e68e..98f5842f8a45e66f9544ee3430d512900406c6dd 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -63,8 +63,7 @@ str2entry( char *s )
         */
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-               "str2entry: \"%s\"\n", s ? s : "NULL" ));
+       LDAP_LOG( OPERATION, DETAIL1, "str2entry: \"%s\"\n", s ? s : "NULL", 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
                s ? s : "NULL", 0, 0 );
@@ -75,8 +74,7 @@ str2entry( char *s )
 
        if( e == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "str2entry: entry allocation failed.\n" ));
+               LDAP_LOG( OPERATION, ERR, "str2entry: entry allocation failed.\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                    "<= str2entry NULL (entry allocation failed)\n",
@@ -99,8 +97,7 @@ str2entry( char *s )
 
                if ( ldif_parse_line( s, &type, &vals[0].bv_val, &vals[0].bv_len ) != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                                  "str2entry:  NULL (parse_line)\n" ));
+                       LDAP_LOG( OPERATION, DETAIL1, "str2entry:  NULL (parse_line)\n",0, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                            "<= str2entry NULL (parse_line)\n", 0, 0, 0 );
@@ -113,10 +110,10 @@ str2entry( char *s )
 
                        if ( e->e_dn != NULL ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, "str2entry: "
+                               LDAP_LOG( OPERATION, DETAIL1, "str2entry: "
                                        "entry %ld has multiple DNs \"%s\" and \"%s\"\n",
                                        (long) e->e_id, e->e_dn,
-                                       vals[0].bv_val != NULL ? vals[0].bv_val : "" ));
+                                       vals[0].bv_val != NULL ? vals[0].bv_val : ""  );
 #else
                                Debug( LDAP_DEBUG_ANY, "str2entry: "
                                        "entry %ld has multiple DNs \"%s\" and \"%s\"\n",
@@ -131,9 +128,9 @@ str2entry( char *s )
                        rc = dnPrettyNormal( NULL, &vals[0], &e->e_name, &e->e_nname );
                        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, "str2entry: "
-                                       "entry %ld has invalid DN \"%s\"\n",
-                                       (long) e->e_id, vals[0].bv_val ));
+                               LDAP_LOG( OPERATION, DETAIL1, 
+                                       "str2entry: entry %ld has invalid DN \"%s\"\n",
+                                       (long) e->e_id, vals[0].bv_val, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY, "str2entry: "
                                        "entry %ld has invalid DN \"%s\"\n",
@@ -152,8 +149,8 @@ str2entry( char *s )
 
                if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                               "str2entry:  str2ad(%s): %s\n", type, text ));
+                       LDAP_LOG( OPERATION, DETAIL1, 
+                               "str2entry:  str2ad(%s): %s\n", type, text, 0 );
 #else
                        Debug( slapMode & SLAP_TOOL_MODE
                                ? LDAP_DEBUG_ANY : LDAP_DEBUG_TRACE,
@@ -169,8 +166,8 @@ str2entry( char *s )
                        rc = slap_str2undef_ad( type, &ad, &text );
                        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                                       "str2entry:  str2undef_ad(%s): %s\n", type, text ));
+                               LDAP_LOG( OPERATION, DETAIL1, 
+                                       "str2entry: str2undef_ad(%s): %s\n", type, text, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "<= str2entry: str2undef_ad(%s): %s\n",
@@ -202,9 +199,9 @@ str2entry( char *s )
 
                        } else {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                               LDAP_LOG( OPERATION, INFO, 
                                        "str2entry: no validator for syntax %s\n", 
-                                       ad->ad_type->sat_syntax->ssyn_oid ));
+                                       ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "str2entry: no validator for syntax %s\n",
@@ -218,9 +215,9 @@ str2entry( char *s )
 
                        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                               LDAP_LOG( OPERATION, ERR, 
                                        "str2entry:  invalid value for syntax %s\n",
-                                       ad->ad_type->sat_syntax->ssyn_oid ));
+                                       ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "str2entry: invalid value for syntax %s\n",
@@ -241,8 +238,8 @@ str2entry( char *s )
                rc = attr_merge( e, ad, vals );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                               "str2entry:  NULL (attr_merge)\n" ));
+                       LDAP_LOG( OPERATION, DETAIL1,
+                               "str2entry:  NULL (attr_merge)\n" , 0, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                            "<= str2entry NULL (attr_merge)\n", 0, 0, 0 );
@@ -260,9 +257,8 @@ str2entry( char *s )
        /* check to make sure there was a dn: line */
        if ( e->e_dn == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "str2entry:  entry %ld has no dn.\n",
-                       (long) e->e_id ));
+               LDAP_LOG( OPERATION, INFO, 
+                       "str2entry:  entry %ld has no dn.\n", (long) e->e_id, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "str2entry: entry %ld has no dn\n",
                    (long) e->e_id, 0, 0 );
@@ -272,8 +268,8 @@ str2entry( char *s )
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2,
-               "str2entry(%s) -> 0x%lx\n", e->e_dn, (unsigned long)e ));
+       LDAP_LOG( OPERATION, DETAIL2,
+               "str2entry(%s) -> 0x%lx\n", e->e_dn, (unsigned long)e, 0 );
 #else
        Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> 0x%lx\n",
                e->e_dn, (unsigned long) e, 0 );
@@ -477,9 +473,8 @@ int entry_encode(Entry *e, struct berval *bv)
        unsigned char *ptr;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-               "entry_encode: id: 0x%08lx  \"%s\"\n",
-               (long) e->e_id, e->e_dn ));
+       LDAP_LOG( OPERATION, DETAIL1, "entry_encode: id: 0x%08lx  \"%s\"\n",
+               (long) e->e_id, e->e_dn, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n",
                (long) e->e_id, e->e_dn, 0 );
@@ -572,8 +567,7 @@ int entry_decode(struct berval *bv, Entry **e)
        x->e_nname.bv_len = i;
        ptr += i+1;
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2,
-               "entry_decode: \"%s\"\n", x->e_dn ));
+       LDAP_LOG( OPERATION, DETAIL2, "entry_decode: \"%s\"\n", x->e_dn, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE,
            "entry_decode: \"%s\"\n",
@@ -601,8 +595,8 @@ int entry_decode(struct berval *bv, Entry **e)
 
                if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                               "entry_decode: str2ad(%s): %s\n", ptr, text ));
+                       LDAP_LOG( OPERATION, INFO, 
+                               "entry_decode: str2ad(%s): %s\n", ptr, text, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "<= entry_decode: str2ad(%s): %s\n", ptr, text, 0 );
@@ -611,8 +605,8 @@ int entry_decode(struct berval *bv, Entry **e)
 
                        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                                       "entry_decode:  str2undef_ad(%s): %s\n", ptr, text));
+                               LDAP_LOG( OPERATION, INFO, 
+                                       "entry_decode:  str2undef_ad(%s): %s\n", ptr, text, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "<= entry_decode: str2undef_ad(%s): %s\n",
@@ -643,8 +637,7 @@ int entry_decode(struct berval *bv, Entry **e)
        if (a)
                a->a_next = NULL;
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-               "entry_decode:  %s\n", x->e_dn ));
+       LDAP_LOG( OPERATION, DETAIL1, "entry_decode:  %s\n", x->e_dn, 0, 0 );
 #else
        Debug(LDAP_DEBUG_TRACE, "<= entry_decode(%s)\n",
                x->e_dn, 0, 0 );