upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-28 10:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6080 again: simplify ber_strnlen, don't use strnlen, revert _GNU_SOURCE

Browse source
This commit is contained in:
Hallvard Furuseth 2009-05-01 03:10:25 +00:00
parent 4e3f04edc3
commit 4b01f4b23a
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/liblber/memory.c
View file

@ -13,10 +13,6 @@
* <http://www.OpenLDAP.org/license.html>.
*/
#ifndef _GNU_SOURCE
#define _GNU_SOURCE 1 /* Needed for <string.h> if HAVE_STRNLEN */
#endif
#include "portable.h"
#include <ac/stdlib.h>
@ -658,19 +654,11 @@ ber_strdup( LDAP_CONST char *s )
ber_len_t
ber_strnlen( LDAP_CONST char *s, ber_len_t len )
{
#ifdef HAVE_STRNLEN
return (ber_len_t)strnlen( s, (ber_len_t)len );
#else
ber_len_t l;
for ( l = 0; l < len; l++ ) {
if ( s[l] == '\0' ) {
return l;
}
}
for ( l = 0; l < len && s[l] != '\0'; l++ ) ;
return len;
#endif /* HAVE_STRNLEN */
return l;
}
char *