X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetfilter.c;h=b0a181a8ef4185c57739d7936da8dd1ebcc9f5bd;hb=e0691dfbc07d0b2a0e6bec528b33802ed04f5960;hp=bf75521457ba02ae5672d473ddd14dddb2af364a;hpb=21c70857f1029309d6bc5a5b6a93d7537494b742;p=openldap diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c index bf75521457..b0a181a8ef 100644 --- a/libraries/libldap/getfilter.c +++ b/libraries/libldap/getfilter.c @@ -83,7 +83,7 @@ ldap_init_getfilter( LDAP_CONST char *fname ) LDAPFiltDesc * -ldap_init_getfilter_buf( char *buf, long buflen ) +ldap_init_getfilter_buf( char *buf, ber_len_t buflen ) { LDAPFiltDesc *lfdp; LDAPFiltList *flp, *nextflp; @@ -314,7 +314,7 @@ ldap_getnextfilter( LDAPFiltDesc *lfdp ) void ldap_build_filter( char *filtbuf, - unsigned long buflen, + ber_len_t buflen, LDAP_CONST char *pattern, LDAP_CONST char *prefix, LDAP_CONST char *suffix, @@ -398,15 +398,14 @@ ldap_build_filter( *f++ = *p; } - if ( (unsigned long) (f - filtbuf) > buflen ) { + if ( (size_t) (f - filtbuf) > buflen ) { /* sanity check */ --f; break; } } - if ( suffix != NULL && ( - (unsigned long) ( f - filtbuf ) < buflen ) ) + if ( suffix != NULL && ( (size_t) (f - filtbuf) < buflen ) ) { strcpy( f, suffix ); } else {