From 9a4eecb12d71c5259c2ab06369d7b692a724bf46 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Mon, 23 Jul 2007 21:41:30 +0000 Subject: [PATCH] Import slap_loglevel_get() integer fix (ITS#5035 part 4) --- servers/slapd/bconfig.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index 73d85230fd..682a54818b 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -2102,8 +2102,7 @@ int slap_loglevel_get( struct berval *s, int *l ) { int rc; - unsigned long i; - slap_mask_t m; + slap_mask_t m, i; if ( loglevel_ops == NULL ) { loglevel_init(); @@ -2113,12 +2112,10 @@ slap_loglevel_get( struct berval *s, int *l ) m |= loglevel_ops[ i ].mask; } - m = ~m; - - for ( i = 1; i <= ( 1 << ( sizeof( int ) * 8 - 1 ) ) && !( m & i ); i <<= 1 ) + for ( i = 1; m & i; i <<= 1 ) ; - if ( !( m & i ) ) { + if ( i == 0 ) { return -1; } -- 2.47.2