ITS#1732 signed/unsigned integers

diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index 011a01a3be3d9a0828c209f6e406f38e47d9505b..2fe5d6fd04b0dfd5d6cff253961decfbed5a7862 100644 (file)
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -31,7 +31,7 @@ static void cont_alloc( Datum *cont, Datum *key )
 
 static void cont_id( Datum *cont, ID id )
 {
-       int i;
+       unsigned int i;
 
        for( i=1; i <= sizeof(id); i++) {
                ((unsigned char *)cont->dptr)[i] = (unsigned char)(id & 0xFF);

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 49edc7a8ad250e1109a268b6c2b5233406745550..6e8f2def32a9573479f6bc13d6f1eeec418dad25 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -197,7 +197,7 @@ meta_back_search(
        for ( i = 0, lsc = lc->conns; lsc[ 0 ] != NULL; ++i, ++lsc ) {
                char    *realbase = ( char * )base->bv_val;
                int     realscope = scope;
-               int     suffixlen;
+               ber_len_t suffixlen;
                char    *mapped_filter, **mapped_attrs;
                
                if ( lsc[ 0 ]->candidate != META_CANDIDATE ) {

diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 0fb5f874ab007e86c9a7e19a5dd6c57e087f3c3c..4a58714d5f0a20b385f8f1cdbfe53c88a099f73c 100644 (file)
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -166,7 +166,7 @@ int module_load(const char* file_name, int argc, char *argv[])
                return rc;
        }
 
-       if (rc >= (sizeof(module_regtable) / sizeof(struct module_regtable_t))
+       if (rc >= (int)(sizeof(module_regtable) / sizeof(struct module_regtable_t))
                || module_regtable[rc].proc == NULL)
        {
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 1ae61e0b65922068918466f2d5a47227703e8b65..171bd3473edf39ea434574af4be6cb4838efb645 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -45,7 +45,7 @@ static char *const err2text[SLAP_SCHERR_LAST+1] = {
 char *
 scherr2str(int code)
 {
-       if ( code < 0 || code >= (sizeof(err2text)/sizeof(char *)) ) {
+       if ( code < 0 || code >= (int)(sizeof(err2text)/sizeof(char *)) ) {
                return "Unknown error";
        } else {
                return err2text[code];