From: Pierangelo Masarati Date: Sat, 4 May 2002 11:07:28 +0000 (+0000) Subject: fix formats X-Git-Tag: OPENLDAP_REL_ENG_2_MP~93 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bffa43e7436ea285f4467ef2328976ebaa66baac;p=openldap fix formats --- diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 4e10755101..83906f6418 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -134,7 +134,7 @@ static long send_ldap_ber( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_ldap_ber: conn %d ber_flush failed err=%d (%s)\n", + "send_ldap_ber: conn %lu ber_flush failed err=%d (%s)\n", conn ? conn->c_connid : 0, err, sock_errstr(err) )); #else Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n", @@ -198,18 +198,18 @@ send_ldap_response( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_ldap_response: conn %d msgid=%ld tag=%ld err=%ld\n", - conn ? conn->c_connid : 0, (long)msgid, (long)tag, (long)err )); + "send_ldap_response: conn %lu msgid=%d tag=%lu err=%d\n", + conn ? conn->c_connid : 0, msgid, tag, err )); #else Debug( LDAP_DEBUG_TRACE, - "send_ldap_response: msgid=%ld tag=%ld err=%ld\n", - (long) msgid, (long) tag, (long) err ); + "send_ldap_response: msgid=%d tag=%lu err=%d\n", + msgid, tag, err ); #endif if( ref ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, - "send_ldap_response: conn %d ref=\"%s\"\n", + "send_ldap_response: conn %lu ref=\"%s\"\n", conn ? conn->c_connid : 0, ref[0].bv_val ? ref[0].bv_val : "NULL" )); #else @@ -226,7 +226,7 @@ send_ldap_response( if (rc != sizeof(struct sockaddr)) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_ldap_response: conn %d ber_write failed\n", + "send_ldap_response: conn %lu ber_write failed\n", conn ? conn->c_connid : 0 )); #else Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 ); @@ -286,7 +286,7 @@ send_ldap_response( if ( rc == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_ldap_response: conn %d ber_printf failed\n", + "send_ldap_response: conn %lu ber_printf failed\n", conn ? conn->c_connid : 0 )); #else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); @@ -303,7 +303,7 @@ send_ldap_response( if ( bytes < 0 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_ldap_response: conn %d ber write failed\n", + "send_ldap_response: conn %lu ber write failed\n", conn ? conn->c_connid : 0 )); #else Debug( LDAP_DEBUG_ANY, @@ -343,7 +343,7 @@ send_ldap_disconnect( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_ldap_disconnect: conn %d %d:%s\n", + "send_ldap_disconnect: conn %lu %d:%s\n", conn ? conn->c_connid : 0, err, text ? text : "" )); #else Debug( LDAP_DEBUG_TRACE, @@ -368,9 +368,8 @@ send_ldap_disconnect( reqoid, NULL, NULL, NULL ); Statslog( LDAP_DEBUG_STATS, - "conn=%ld op=%ld DISCONNECT tag=%lu err=%ld text=%s\n", - (long) op->o_connid, (long) op->o_opid, - (unsigned long) tag, (long) err, text ? text : "" ); + "conn=%lu op=%lu DISCONNECT tag=%lu err=%d text=%s\n", + op->o_connid, op->o_opid, tag, err, text ? text : "" ); } void @@ -392,18 +391,18 @@ send_ldap_result( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_ldap_result : conn %ld op=%ld p=%d\n", - (long)op->o_connid, (long)op->o_opid, op->o_protocol )); + "send_ldap_result : conn %lu op=%lu p=%d\n", + op->o_connid, op->o_opid, op->o_protocol )); #else Debug( LDAP_DEBUG_TRACE, - "send_ldap_result: conn=%ld op=%ld p=%d\n", - (long) op->o_connid, (long) op->o_opid, op->o_protocol ); + "send_ldap_result: conn=%lu op=%lu p=%d\n", + op->o_connid, op->o_opid, op->o_protocol ); #endif #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, - "send_ldap_result: conn=%ld err=%d matched=\"%s\" text=\"%s\"\n", - (long)op->o_connid, err, matched ? matched : "", text ? text : "" )); + "send_ldap_result: conn=%lu err=%d matched=\"%s\" text=\"%s\"\n", + op->o_connid, err, matched ? matched : "", text ? text : "" )); #else Debug( LDAP_DEBUG_ARGS, "send_ldap_result: err=%d matched=\"%s\" text=\"%s\"\n", @@ -448,9 +447,8 @@ send_ldap_result( NULL, NULL, NULL, ctrls ); Statslog( LDAP_DEBUG_STATS, - "conn=%ld op=%ld RESULT tag=%lu err=%ld text=%s\n", - (long) op->o_connid, (long) op->o_opid, - (unsigned long) tag, (long) err, text ? text : "" ); + "conn=%lu op=%lu RESULT tag=%lu err=%d text=%s\n", + op->o_connid, op->o_opid, tag, err, text ? text : "" ); if( tmp != NULL ) { ch_free(tmp); @@ -474,11 +472,11 @@ send_ldap_sasl( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_ldap_sasl: conn %d err=%ld len=%ld\n", - op->o_connid, (long)err, cred ? cred->bv_len : -1 )); + "send_ldap_sasl: conn %lu err=%d len=%lu\n", + op->o_connid, err, cred ? cred->bv_len : -1 )); #else - Debug( LDAP_DEBUG_TRACE, "send_ldap_sasl: err=%ld len=%ld\n", - (long) err, cred ? cred->bv_len : -1, NULL ); + Debug( LDAP_DEBUG_TRACE, "send_ldap_sasl: err=%d len=%ld\n", + err, cred ? (long) cred->bv_len : -1, NULL ); #endif @@ -508,15 +506,15 @@ send_ldap_extended( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_ldap_extended: conn %d err=%ld oid=%s len=%ld\n", - op->o_connid, (long)err, rspoid ? rspoid : "", - rspdata != NULL ? (long)rspdata->bv_len : (long)0 )); + "send_ldap_extended: conn %lu err=%d oid=%s len=%ld\n", + op->o_connid, err, rspoid ? rspoid : "", + rspdata != NULL ? rspdata->bv_len : 0 )); #else Debug( LDAP_DEBUG_TRACE, - "send_ldap_extended err=%ld oid=%s len=%ld\n", - (long) err, + "send_ldap_extended err=%d oid=%s len=%ld\n", + err, rspoid ? rspoid : "", - rspdata != NULL ? (long) rspdata->bv_len : (long) 0 ); + rspdata != NULL ? rspdata->bv_len : 0 ); #endif @@ -555,7 +553,8 @@ send_search_result( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_search_result: conn %d err=%d matched=\"%s\"\n", + "send_search_result: conn %lu err=%d " + "matched=\"%s\" text=\"%s\"\n", op->o_connid, err, matched ? matched : "", text ? text : "" )); #else @@ -596,12 +595,11 @@ send_search_result( { char nbuf[64]; - sprintf( nbuf, "%ld nentries=%d", (long) err, nentries ); + sprintf( nbuf, "%d nentries=%d", err, nentries ); Statslog( LDAP_DEBUG_STATS, - "conn=%ld op=%ld SEARCH RESULT tag=%lu err=%s text=%s\n", - (long) op->o_connid, (long) op->o_opid, - (unsigned long) tag, nbuf, text ? text : "" ); + "conn=%lu op=%lu SEARCH RESULT tag=%lu err=%s text=%s\n", + op->o_connid, op->o_opid, tag, nbuf, text ? text : "" ); } if (tmp != NULL) { @@ -650,7 +648,7 @@ send_search_entry( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_search_entry: conn %d dn=\"%s\"%s\n", + "send_search_entry: conn %lu dn=\"%s\"%s\n", op->o_connid, e->e_dn, attrsonly ? " (attrsOnly)" : "" )); #else @@ -664,7 +662,8 @@ send_search_entry( { #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_INFO, - "send_search_entry: conn %d access to entry (%s) not allowed\n", + "send_search_entry: conn %lu access " + "to entry (%s) not allowed\n", op->o_connid, e->e_dn )); #else Debug( LDAP_DEBUG_ACL, @@ -685,7 +684,7 @@ send_search_entry( if (rc != sizeof(struct sockaddr)) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed\n", + "send_search_entry: conn %lu ber_printf failed\n", conn ? conn->c_connid : 0 )); #else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); @@ -698,7 +697,7 @@ send_search_entry( rc = ber_printf( ber, "{is{t{O{" /*}}}*/, op->o_msgid, "", LDAP_RES_SEARCH_ENTRY, &e->e_name ); } else -#endif +#endif /* LDAP_CONNECTIONLESS */ { rc = ber_printf( ber, "{it{O{" /*}}}*/, op->o_msgid, LDAP_RES_SEARCH_ENTRY, &e->e_name ); @@ -707,7 +706,7 @@ send_search_entry( if ( rc == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed\n", + "send_search_entry: conn %lu ber_printf failed\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); @@ -752,11 +751,12 @@ send_search_entry( if ( rc == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d matched values fitering failed\n", + "send_search_entry: conn %lu " + "matched values filtering failed\n", conn ? conn->c_connid : 0 )); #else Debug( LDAP_DEBUG_ANY, - "matched values fitering failed\n", 0, 0, 0 ); + "matched values filtering failed\n", 0, 0, 0 ); #endif ber_free( ber, 1 ); @@ -767,7 +767,8 @@ send_search_entry( free( e_flags ); send_ldap_result( conn, op, LDAP_OTHER, - NULL, "matched values fitering error", NULL, NULL ); + NULL, "matched values filtering error", + NULL, NULL ); goto error_return; } } @@ -802,7 +803,8 @@ send_search_entry( { #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_INFO, "send_search_entry: " - "conn %d access to attribute %s not allowed\n", + "conn %lu access to attribute %s " + "not allowed\n", op->o_connid, desc->ad_cname.bv_val )); #else Debug( LDAP_DEBUG_ACL, "acl: " @@ -815,7 +817,8 @@ send_search_entry( if (( rc = ber_printf( ber, "{O[" /*]}*/ , &desc->ad_cname )) == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed\n", + "send_search_entry: " + "conn %lu ber_printf failed\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); @@ -839,13 +842,16 @@ send_search_entry( { #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_INFO, - "send_search_entry: conn %d " - "access to attribute %s, value %d not allowed\n", - op->o_connid, desc->ad_cname.bv_val, i )); + "send_search_entry: conn %lu " + "access to attribute %s, " + "value %d not allowed\n", + op->o_connid, + desc->ad_cname.bv_val, i )); #else Debug( LDAP_DEBUG_ACL, - "acl: access to attribute %s, value %d not allowed\n", - desc->ad_cname.bv_val, i, 0 ); + "acl: access to attribute %s, " + "value %d not allowed\n", + desc->ad_cname.bv_val, i, 0 ); #endif continue; @@ -858,7 +864,8 @@ send_search_entry( if (( rc = ber_printf( ber, "O", &a->a_vals[i] )) == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed.\n", + "send_search_entry: conn %lu " + "ber_printf failed.\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, @@ -872,7 +879,8 @@ send_search_entry( } free( e_flags ); send_ldap_result( conn, op, LDAP_OTHER, - NULL, "encoding values error", NULL, NULL ); + NULL, "encoding values error", + NULL, NULL ); goto error_return; } } @@ -881,7 +889,8 @@ send_search_entry( if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed\n", + "send_search_entry: conn %lu " + "ber_printf failed\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); @@ -939,12 +948,13 @@ send_search_entry( { #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_INFO, - "send_search_entry: conn %s " + "send_search_entry: conn %lu " "access to attribute %s not allowed\n", op->o_connid, desc->ad_cname.bv_val )); #else - Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n", - desc->ad_cname.bv_val, 0, 0 ); + Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s " + "not allowed\n", + desc->ad_cname.bv_val, 0, 0 ); #endif continue; @@ -954,7 +964,8 @@ send_search_entry( if ( rc == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed\n", + "send_search_entry: conn %lu " + "ber_printf failed\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); @@ -974,13 +985,16 @@ send_search_entry( { #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_INFO, - "send_search_entry: conn %d " - "access to %s, value %d not allowed\n", - op->o_connid, desc->ad_cname.bv_val, i )); + "send_search_entry: conn %lu " + "access to %s, value %d " + "not allowed\n", + op->o_connid, + desc->ad_cname.bv_val, i )); #else Debug( LDAP_DEBUG_ACL, - "acl: access to attribute %s, value %d not allowed\n", - desc->ad_cname.bv_val, i, 0 ); + "acl: access to attribute %s, " + "value %d not allowed\n", + desc->ad_cname.bv_val, i, 0 ); #endif continue; @@ -989,7 +1003,9 @@ send_search_entry( if (( rc = ber_printf( ber, "O", &a->a_vals[i] )) == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed\n", + "send_search_entry: " + "conn %lu ber_printf " + "failed\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, @@ -998,7 +1014,8 @@ send_search_entry( ber_free_buf( ber ); send_ldap_result( conn, op, LDAP_OTHER, - NULL, "encoding values error", NULL, NULL ); + NULL, "encoding values error", + NULL, NULL ); attrs_free( aa ); goto error_return; } @@ -1008,7 +1025,8 @@ send_search_entry( if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed\n", + "send_search_entry: conn %lu " + "ber_printf failed\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); @@ -1033,7 +1051,7 @@ send_search_entry( if ( rc == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_entry: conn %d ber_printf failed\n", + "send_search_entry: conn %lu ber_printf failed\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); @@ -1051,7 +1069,7 @@ send_search_entry( if ( bytes < 0 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_ldap_response: conn %d ber write failed.\n", + "send_ldap_response: conn %lu ber write failed.\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, @@ -1068,12 +1086,12 @@ send_search_entry( num_pdu_sent++; ldap_pvt_thread_mutex_unlock( &num_sent_mutex ); - Statslog( LDAP_DEBUG_STATS2, "conn=%ld op=%ld ENTRY dn=\"%s\"\n", - (long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 ); + Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu ENTRY dn=\"%s\"\n", + conn->c_connid, op->o_opid, e->e_dn, 0, 0 ); #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_search_entry: conn %d exit.\n", + "send_search_entry: conn %lu exit.\n", op->o_connid )); #else Debug( LDAP_DEBUG_TRACE, "<= send_search_entry\n", 0, 0, 0 ); @@ -1106,7 +1124,7 @@ send_search_reference( #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_search_reference: conn %d dn=\"%s\"\n", + "send_search_reference: conn %lu dn=\"%s\"\n", op->o_connid, e->e_dn )); #else Debug( LDAP_DEBUG_TRACE, @@ -1120,7 +1138,8 @@ send_search_reference( { #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_INFO, - "send_search_reference: conn %d access to entry %s not allowed\n", + "send_search_reference: conn %lu " + "access to entry %s not allowed\n", op->o_connid, e->e_dn )); #else Debug( LDAP_DEBUG_ACL, @@ -1136,11 +1155,13 @@ send_search_reference( { #ifdef NEW_LOGGING LDAP_LOG(( "acl", LDAP_LEVEL_INFO, - "send_search_reference: conn %d access to reference not allowed.\n", + "send_search_reference: conn %lu access " + "to reference not allowed.\n", op->o_connid )); #else Debug( LDAP_DEBUG_ACL, - "send_search_reference: access to reference not allowed\n", + "send_search_reference: access " + "to reference not allowed\n", 0, 0, 0 ); #endif @@ -1150,7 +1171,7 @@ send_search_reference( if( refs == NULL ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_reference: null ref in (%s).\n", + "send_search_reference: conn %lu null ref in (%s).\n", op->o_connid, e->e_dn )); #else Debug( LDAP_DEBUG_ANY, @@ -1177,7 +1198,8 @@ send_search_reference( if ( rc == -1 ) { #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ERR, - "send_search_reference: conn %d ber_printf failed.\n", + "send_search_reference: conn %lu " + "ber_printf failed.\n", op->o_connid )); #else Debug( LDAP_DEBUG_ANY, @@ -1199,12 +1221,12 @@ send_search_reference( num_pdu_sent++; ldap_pvt_thread_mutex_unlock( &num_sent_mutex ); - Statslog( LDAP_DEBUG_STATS2, "conn=%ld op=%ld REF dn=\"%s\"\n", - (long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 ); + Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu REF dn=\"%s\"\n", + conn->c_connid, op->o_opid, e->e_dn, 0, 0 ); #ifdef NEW_LOGGING LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "send_search_reference: conn %d exit.\n", op->o_connid )); + "send_search_reference: conn %lu exit.\n", op->o_connid )); #else Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 ); #endif