From 85fff65664f467ec24f5535f8d5e2b3e76f8a3ea Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 10 Nov 2008 19:11:24 +0000 Subject: [PATCH] Warning cleanup: signed meets unsigned. --- servers/slapd/overlays/constraint.c | 14 +++++++------- servers/slapd/schema_init.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c index c514da31a7..10361909bd 100644 --- a/servers/slapd/overlays/constraint.c +++ b/servers/slapd/overlays/constraint.c @@ -786,8 +786,8 @@ constraint_add( Operation *op, SlapReply *rs ) Debug(LDAP_DEBUG_TRACE, "==> constraint_add, " - "a->a_numvals = %d, cp->count = %d\n", - a->a_numvals, cp->count, 0); + "a->a_numvals = %u, cp->count = %lu\n", + a->a_numvals, (unsigned long) cp->count, 0); if ((cp->count != 0) && (a->a_numvals > cp->count)) { rc = LDAP_CONSTRAINT_VIOLATION; @@ -885,7 +885,7 @@ constraint_update( Operation *op, SlapReply *rs ) rc = LDAP_CONSTRAINT_VIOLATION; for(;m; m = m->sml_next) { - int ce = 0; + unsigned ce = 0; if (is_at_operational( m->sml_desc->ad_type )) continue; @@ -916,7 +916,7 @@ constraint_update( Operation *op, SlapReply *rs ) } if (cp->count != 0) { - int ca; + unsigned ca; if (m->sml_op == LDAP_MOD_DELETE) ce = 0; @@ -924,9 +924,9 @@ constraint_update( Operation *op, SlapReply *rs ) for (ca = 0; b[ca].bv_val; ++ca); Debug(LDAP_DEBUG_TRACE, - "==> constraint_update ce = %d, " - "ca = %d, cp->count = %d\n", - ce, ca, cp->count); + "==> constraint_update ce = %u, " + "ca = %u, cp->count = %lu\n", + ce, ca, (unsigned long) cp->count); if (m->sml_op == LDAP_MOD_ADD) { if (ca + ce > cp->count) { diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index ca508cfdfe..8e0dac28f6 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -4363,8 +4363,8 @@ serialNumberAndIssuerSerialCheck( ber_dupbv_x( &ni, is, ctx ); } else { - ber_int_t src, dst; - + ber_len_t src, dst; + ni.bv_len = is->bv_len - numdquotes; ni.bv_val = ber_memalloc_x( ni.bv_len + 1, ctx ); for ( src = 0, dst = 0; src < is->bv_len; src++, dst++ ) { -- 2.39.5