mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Format fixes (%d<->%lu etc)

Browse Source
This commit is contained in:
Hallvard Furuseth 2005-07-04 05:29:12 +00:00
parent e35ffd471b
commit 8a696d21b2
7 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/bind.c
View File

@ -449,7 +449,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
send_ldap_result( op, rs ); send_ldap_result( op, rs );
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d unknown authentication method (%ld)\n", "do_bind: v%d unknown authentication method (%d)\n",
op->o_protocol, op->orb_method, 0 ); op->o_protocol, op->orb_method, 0 );
goto cleanup; goto cleanup;
} }

3
servers/slapd/component.c
View File

@ -447,7 +447,8 @@ get_componentId( Operation *op, ComponentAssertionValue* cav,
type = peek_componentId_type( cav ); type = peek_componentId_type( cav );
Debug( LDAP_DEBUG_FILTER, "get_compId [%d]\n", type, 0, 0 ); Debug( LDAP_DEBUG_FILTER, "get_compId [%lu]\n",
(unsigned long) type, 0, 0 );
len = 0; len = 0;
_cid.ci_type = type; _cid.ci_type = type;
_cid.ci_next = NULL; _cid.ci_next = NULL;

4
servers/slapd/config.c
View File

@ -92,7 +92,7 @@ new_config_args( BackendDB *be, const char *fname, int lineno, int argc, char **
c->argc = argc; c->argc = argc;
c->argv = argv; c->argv = argv;
c->lineno = lineno; c->lineno = lineno;
snprintf( c->log, sizeof( c->log ), "%s: line %lu", fname, lineno ); snprintf( c->log, sizeof( c->log ), "%s: line %d", fname, lineno );
return(c); return(c);
} }
@ -1191,7 +1191,7 @@ int config_generic_wrapper( Backend *be, const char *fname, int lineno,
c.argc = argc; c.argc = argc;
c.argv = argv; c.argv = argv;
c.valx = -1; c.valx = -1;
sprintf( c.log, "%s: line %lu", fname, lineno ); sprintf( c.log, "%s: line %d", fname, lineno );
rc = SLAP_CONF_UNKNOWN; rc = SLAP_CONF_UNKNOWN;
ct = config_find_keyword( be->be_cf_ocs->co_table, &c ); ct = config_find_keyword( be->be_cf_ocs->co_table, &c );

8
servers/slapd/filter.c
View File

@ -173,7 +173,7 @@ get_filter(
if( err != LDAP_SUCCESS ) { if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */ /* unrecognized attribute description or other error */
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"get_filter: conn %d unknown attribute " "get_filter: conn %lu unknown attribute "
"type=%s (%d)\n", "type=%s (%d)\n",
op->o_connid, type.bv_val, err ); op->o_connid, type.bv_val, err );
@ -349,8 +349,8 @@ get_ssa(
if( rc != LDAP_SUCCESS ) { if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"get_ssa: conn %d unknown attribute type=%s (%d)\n", "get_ssa: conn %lu unknown attribute type=%s (%ld)\n",
op->o_connid, desc.bv_val, rc ); op->o_connid, desc.bv_val, (long) rc );
/* skip over the rest of this filter */ /* skip over the rest of this filter */
for ( tag = ber_first_element( ber, &len, &last ); for ( tag = ber_first_element( ber, &len, &last );
@ -882,7 +882,7 @@ get_simple_vrFilter(
if( err != LDAP_SUCCESS ) { if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */ /* unrecognized attribute description or other error */
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"get_simple_vrFilter: conn %d unknown " "get_simple_vrFilter: conn %lu unknown "
"attribute type=%s (%d)\n", "attribute type=%s (%d)\n",
op->o_connid, type.bv_val, err ); op->o_connid, type.bv_val, err );

5
servers/slapd/sasl.c
View File

@ -1495,10 +1495,11 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id,
assert( conn ); assert( conn );
assert( id ); assert( id );
Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: conn %d id=%s [len=%d]\n", Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: conn %lu id=%s [len=%lu]\n",
conn->c_connid, conn->c_connid,
BER_BVISNULL( id ) ? "NULL" : ( BER_BVISEMPTY( id ) ? "<empty>" : id->bv_val ), BER_BVISNULL( id ) ? "NULL" : ( BER_BVISEMPTY( id ) ? "<empty>" : id->bv_val ),
BER_BVISNULL( id ) ? 0 : ( BER_BVISEMPTY( id ) ? 0 : id->bv_len ) ); BER_BVISNULL( id ) ? 0 : ( BER_BVISEMPTY( id ) ? 0 :
(unsigned long) id->bv_len ) );
if ( !op ) { if ( !op ) {
op = conn->c_sasl_bindop; op = conn->c_sasl_bindop;

2
servers/slapd/sl_malloc.c
View File

@ -633,7 +633,7 @@ print_slheap(int level, void *ctx)
Debug(level, "free list:\n", 0, 0, 0); Debug(level, "free list:\n", 0, 0, 0);
so = LDAP_LIST_FIRST(&sh->sh_free[i-order_start]); so = LDAP_LIST_FIRST(&sh->sh_free[i-order_start]);
while (so) { while (so) {
Debug(level, "%x\n",so->so_ptr, 0, 0); Debug(level, "%lx\n", (unsigned long) so->so_ptr, 0, 0);
so = LDAP_LIST_NEXT(so, so_link); so = LDAP_LIST_NEXT(so, so_link);
} }
} }

4
servers/slapd/syncrepl.c
View File

@ -2663,7 +2663,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
bindconf_unparse( &si->si_bindconf, &bc ); bindconf_unparse( &si->si_bindconf, &bc );
ptr = buf; ptr = buf;
ptr += sprintf( ptr, IDSTR "=%03d " PROVIDERSTR "=%s", ptr += sprintf( ptr, IDSTR "=%03ld " PROVIDERSTR "=%s",
si->si_rid, si->si_provideruri.bv_val ); si->si_rid, si->si_provideruri.bv_val );
if ( !BER_BVISNULL( &bc )) { if ( !BER_BVISNULL( &bc )) {
ptr = lutil_strcopy( ptr, bc.bv_val ); ptr = lutil_strcopy( ptr, bc.bv_val );
@ -2737,7 +2737,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
for (i=0; si->si_retryinterval[i]; i++) { for (i=0; si->si_retryinterval[i]; i++) {
if ( space ) *ptr++ = ' '; if ( space ) *ptr++ = ' ';
space = 1; space = 1;
ptr += sprintf( ptr, "%d ", si->si_retryinterval[i] ); ptr += sprintf( ptr, "%ld ", (long) si->si_retryinterval[i] );
if ( si->si_retrynum_init[i] == -1 ) if ( si->si_retrynum_init[i] == -1 )
*ptr++ = '+'; *ptr++ = '+';
else else