ITS#6262

[openldap] / libraries / libldap / abandon.c

diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 8f2fb3419499583f22babc83938cba956afc923e..d8cb33128dd6631d808b85d83cbd042dc42dba72 100644 (file)
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2010 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -349,7 +349,6 @@ ldap_int_bisect_find( ber_int_t *v, ber_len_t n, ber_int_t id, int *idxp )
                        end,
                        rc = 0;
 
-       assert( n >= 0 );
        assert( id >= 0 );
 
        begin = 0;
@@ -410,9 +409,8 @@ ldap_int_bisect_insert( ber_int_t **vp, ber_len_t *np, int id, int idx )
 
        assert( vp != NULL );
        assert( np != NULL );
-       assert( *np >= 0 );
        assert( idx >= 0 );
-       assert( idx <= *np );
+       assert( (unsigned) idx <= *np );
 
        n = *np;
 
@@ -447,14 +445,12 @@ int
 ldap_int_bisect_delete( ber_int_t **vp, ber_len_t *np, int id, int idx )
 {
        ber_int_t       *v;
-       ber_len_t       n;
-       int             i;
+       ber_len_t       i, n;
 
        assert( vp != NULL );
        assert( np != NULL );
-       assert( *np >= 0 );
        assert( idx >= 0 );
-       assert( idx < *np );
+       assert( (unsigned) idx < *np );
 
        v = *vp;