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

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index c39caea9f64e37be8a26d0ead16d2685e5fa49bd..6dac6e2a6b2a3fc7a4c4509fd6e8237dff7a9a97 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -449,7 +449,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
 
                send_ldap_result( op, rs );
                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 );
                goto cleanup;
        }

diff --git a/servers/slapd/component.c b/servers/slapd/component.c
index bb66c4cee7bc23a1f230db690e5f664bf5a3c3bd..7633af36de03b79ec25b79ce2b5b1ba4741d4d40 100644 (file)
--- a/servers/slapd/component.c
+++ b/servers/slapd/component.c
@@ -447,7 +447,8 @@ get_componentId( Operation *op, ComponentAssertionValue* 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;
        _cid.ci_type = type;
        _cid.ci_next = NULL;

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index d650f37472a32f76ff556ebfe9290f168f746b77..acf465c2fd834c247386730136b3f29bee335bd6 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -92,7 +92,7 @@ new_config_args( BackendDB *be, const char *fname, int lineno, int argc, char **
        c->argc   = argc;
        c->argv   = argv; 
        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);
 }
 
@@ -1191,7 +1191,7 @@ int config_generic_wrapper( Backend *be, const char *fname, int lineno,
        c.argc = argc;
        c.argv = argv;
        c.valx = -1;
-       sprintf( c.log, "%s: line %lu", fname, lineno );
+       sprintf( c.log, "%s: line %d", fname, lineno );
 
        rc = SLAP_CONF_UNKNOWN;
        ct = config_find_keyword( be->be_cf_ocs->co_table, &c );

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

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 10b17ca62f33e0d7d0ab3574b0c81660014ab697..ec28ea3cb3c5faf29e8dd2780a9edc34c2effe6a 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1495,10 +1495,11 @@ int slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id,
        assert( conn );
        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,
                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 ) {
                op = conn->c_sasl_bindop;

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index d065c57ec9166a3cb99da6699810de0eb4136513..1f6bd267f5b80b0d2052ae8928d6f8061023e1d9 100644 (file)
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -633,7 +633,7 @@ print_slheap(int level, void *ctx)
                Debug(level, "free list:\n", 0, 0, 0);
                so = LDAP_LIST_FIRST(&sh->sh_free[i-order_start]);
                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);
                }
        }

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 118e7771b53c6af08242f225324eb9e0f33bbc09..d84743c5c21a195a6c5c5230f006ab70e9da6d97 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2663,7 +2663,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
 
        bindconf_unparse( &si->si_bindconf, &bc );
        ptr = buf;
-       ptr += sprintf( ptr, IDSTR "=%03d " PROVIDERSTR "=%s",
+       ptr += sprintf( ptr, IDSTR "=%03ld " PROVIDERSTR "=%s",
                si->si_rid, si->si_provideruri.bv_val );
        if ( !BER_BVISNULL( &bc )) {
                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++) {
                        if ( space ) *ptr++ = ' ';
                        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 )
                                *ptr++ = '+';
                        else