From 09129c73d7b7fc97478fe642dc43f7e5ce9a2ba9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 23 Aug 2006 11:32:29 +0000
Subject: r17750: these have moved to ldb/replace/ now (This used to be commit
 ac178b52935d7629f8583092e833b74093ca70e1)

---
 source4/lib/replace/config.m4 | 11 ++-----
 source4/lib/replace/config.mk |  1 -
 source4/lib/replace/replace.c | 44 --------------------------
 source4/lib/replace/timegm.c  | 72 -------------------------------------------
 4 files changed, 2 insertions(+), 126 deletions(-)
 delete mode 100644 source4/lib/replace/timegm.c

(limited to 'source4/lib')

diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index 8b71372262..0fda967c54 100644
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -1,16 +1,10 @@
 AC_CHECK_HEADERS([stdint.h inttypes.h])
 AC_CHECK_TYPE(uint_t, unsigned int)
-AC_CHECK_TYPE(int8_t, signed char)
-AC_CHECK_TYPE(uint8_t, unsigned char)
 AC_CHECK_TYPE(int16_t, short)
 AC_CHECK_TYPE(uint16_t, unsigned short)
 AC_CHECK_TYPE(int32_t, long)
 AC_CHECK_TYPE(uint32_t, unsigned long)
-AC_CHECK_TYPE(int64_t, long long)
-AC_CHECK_TYPE(uint64_t, unsigned long long)
 AC_CHECK_TYPE(ssize_t, int)
-AC_CHECK_TYPE(comparison_fn_t, 
-[AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])])
 
 AC_CHECK_HEADERS(stdbool.h)
 
@@ -53,10 +47,9 @@ AC_TRY_COMPILE([
 [AC_DEFINE(socklen_t, int,[Socket length type])])
 
 AC_CHECK_HEADERS(sys/syslog.h syslog.h)
-AC_CHECK_FUNCS(strtoull __strtoull strtouq strtoll __strtoll strtoq)
 AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
-AC_CHECK_FUNCS(timegm setenv vsyslog setlinebuf mktime ftruncate chsize rename)
-AC_CHECK_FUNCS(waitpid strnlen strlcpy strlcat innetgr initgroups memmove strdup)
+AC_CHECK_FUNCS(setenv vsyslog setlinebuf mktime ftruncate chsize rename)
+AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
 AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp)
 AC_HAVE_DECL(setresuid, [#include <unistd.h>])
 AC_HAVE_DECL(setresgid, [#include <unistd.h>])
diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk
index 7ec1eaffa2..4fd5402f61 100644
--- a/source4/lib/replace/config.mk
+++ b/source4/lib/replace/config.mk
@@ -11,7 +11,6 @@ OBJ_FILES = \
 [SUBSYSTEM::LIBREPLACE]
 OBJ_FILES = replace.o \
 		snprintf.o \
-		timegm.o \
 		dlfcn.o \
 		getpass.o
 PUBLIC_DEPENDENCIES = REPLACE_READDIR
diff --git a/source4/lib/replace/replace.c b/source4/lib/replace/replace.c
index 989c0947c3..b74cd7f95a 100644
--- a/source4/lib/replace/replace.c
+++ b/source4/lib/replace/replace.c
@@ -387,37 +387,6 @@ duplicate a string
 #endif
 
 
-#ifndef HAVE_STRTOULL
- unsigned long long int strtoull(const char *str, char **endptr, int base)
-{
-#ifdef HAVE_STRTOUQ
-	return strtouq(str, endptr, base);
-#elif defined(HAVE___STRTOULL) 
-	return __strtoull(str, endptr, base);
-#elif SIZEOF_LONG == SIZEOF_LONG_LONG
-	return (unsigned long long int) strtoul(str, endptr, base);
-#else
-# error "You need a strtoull function"
-#endif
-}
-#endif
-
-#ifndef HAVE_STRTOLL
- long long int strtoll(const char *str, char **endptr, int base)
-{
-#ifdef HAVE_STRTOQ
-	return strtoq(str, endptr, base);
-#elif defined(HAVE___STRTOLL) 
-	return __strtoll(str, endptr, base);
-#elif SIZEOF_LONG == SIZEOF_LONG_LONG
-	return (long long int) strtol(str, endptr, base);
-#else
-# error "You need a strtoll function"
-#endif
-}
-#endif
-
-
 #ifndef HAVE_STRNDUP
 /**
  Some platforms don't have strndup.
@@ -437,19 +406,6 @@ duplicate a string
 }
 #endif
 
-#ifndef HAVE_STRNLEN
-/**
- Some platforms don't have strnlen
-**/
- size_t strnlen(const char *s, size_t n)
-{
-	int i;
-	for (i=0; s[i] && i<n; i++)
-		/* noop */ ;
-	return i;
-}
-#endif
-
 #ifndef HAVE_WAITPID
 int waitpid(pid_t pid,int *status,int options)
 {
diff --git a/source4/lib/replace/timegm.c b/source4/lib/replace/timegm.c
deleted file mode 100644
index f2741e0eff..0000000000
--- a/source4/lib/replace/timegm.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
- *
- * 3. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
- */
-
-/*
-  adapted for Samba4 by Andrew Tridgell
-*/
-
-#include "includes.h"
-#include "system/time.h"
-
-#ifndef HAVE_TIMEGM
-
-static int is_leap(unsigned y)
-{
-	y += 1900;
-	return (y % 4) == 0 && ((y % 100) != 0 || (y % 400) == 0);
-}
-
-time_t timegm(struct tm *tm)
-{
-	static const unsigned ndays[2][12] ={
-		{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-		{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};
-	time_t res = 0;
-	unsigned i;
-	
-	for (i = 70; i < tm->tm_year; ++i)
-		res += is_leap(i) ? 366 : 365;
-	
-	for (i = 0; i < tm->tm_mon; ++i)
-		res += ndays[is_leap(tm->tm_year)][i];
-	res += tm->tm_mday - 1;
-	res *= 24;
-	res += tm->tm_hour;
-	res *= 60;
-	res += tm->tm_min;
-	res *= 60;
-	res += tm->tm_sec;
-	return res;
-}
-
-#endif /* HAVE_TIMEGM */
-- 
cgit