svn commit: samba r17841 - in branches/SAMBA_4_0/source/lib/replace: .

vlendec at samba.org vlendec at samba.org
Sat Aug 26 16:44:10 GMT 2006


Author: vlendec
Date: 2006-08-26 16:44:10 +0000 (Sat, 26 Aug 2006)
New Revision: 17841

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17841

Log:
Revert 17840, libldb.a defines strnlen. Sorry for the noise
Modified:
   branches/SAMBA_4_0/source/lib/replace/config.m4
   branches/SAMBA_4_0/source/lib/replace/replace.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/config.m4	2006-08-26 16:19:22 UTC (rev 17840)
+++ branches/SAMBA_4_0/source/lib/replace/config.m4	2006-08-26 16:44:10 UTC (rev 17841)
@@ -50,7 +50,7 @@
 AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
 AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
-AC_CHECK_FUNCS(pread pwrite strndup strnlen strcasestr strtok_r mkdtemp)
+AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
 AC_HAVE_DECL(setresuid, [#include <unistd.h>])
 AC_HAVE_DECL(setresgid, [#include <unistd.h>])
 AC_HAVE_DECL(errno, [#include <errno.h>])

Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.c	2006-08-26 16:19:22 UTC (rev 17840)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c	2006-08-26 16:44:10 UTC (rev 17841)
@@ -387,20 +387,6 @@
 }
 #endif
 
-#ifndef HAVE_STRNLEN
-/**
- Some platforms don't have strnlen
-**/
-
- size_t strnlen(const char *s, size_t n)
-{
-	size_t i;
-	for (i=0; i<n && s[i] != '\0'; i++)
-		/* noop */ ;
-	return i;
-}
-#endif
-
 #ifndef HAVE_WAITPID
 int waitpid(pid_t pid,int *status,int options)
 {



More information about the samba-cvs mailing list