r1717 - in trunk/varnish-cache: include include/compat lib/libcompat

[des at projects.linpro.no]

Author: des
Date: 2007-07-19 13:02:57 +0200 (Thu, 19 Jul 2007)
New Revision: 1717

Removed:
   trunk/varnish-cache/include/compat/clock_gettime.h
   trunk/varnish-cache/lib/libcompat/clock_gettime.c
Modified:
   trunk/varnish-cache/include/Makefile.am
   trunk/varnish-cache/lib/libcompat/Makefile.am
Log:
Retire libcompat's clock_gettime().


Modified: trunk/varnish-cache/include/Makefile.am
===================================================================
--- trunk/varnish-cache/include/Makefile.am	2007-07-19 11:01:36 UTC (rev 1716)
+++ trunk/varnish-cache/include/Makefile.am	2007-07-19 11:02:57 UTC (rev 1717)
@@ -13,7 +13,6 @@
 	cli_common.h \
 	cli_priv.h \
 	compat/asprintf.h \
-	compat/clock_gettime.h \
 	compat/setproctitle.h \
 	compat/srandomdev.h \
 	compat/strlcat.h \

Deleted: trunk/varnish-cache/include/compat/clock_gettime.h
===================================================================
--- trunk/varnish-cache/include/compat/clock_gettime.h	2007-07-19 11:01:36 UTC (rev 1716)
+++ trunk/varnish-cache/include/compat/clock_gettime.h	2007-07-19 11:02:57 UTC (rev 1717)
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
- * All rights reserved.
- *
- * Author: Dag-Erling Smørgrav <des at linpro.no>
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $Id$
- */
-
-#ifndef COMPAT_CLOCK_GETTIME_H_INCLUDED
-#define COMPAT_CLOCK_GETTIME_H_INCLUDED
-
-#ifndef HAVE_CLOCK_GETTIME
-typedef enum {
-	CLOCK_REALTIME,
-	CLOCK_MONOTONIC,
-} clockid_t;
-
-int clock_gettime(clockid_t clk_id, struct timespec *tp);
-#endif
-
-#endif

Modified: trunk/varnish-cache/lib/libcompat/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libcompat/Makefile.am	2007-07-19 11:01:36 UTC (rev 1716)
+++ trunk/varnish-cache/lib/libcompat/Makefile.am	2007-07-19 11:02:57 UTC (rev 1717)
@@ -6,7 +6,6 @@
 
 libcompat_a_SOURCES = \
 	asprintf.c \
-	clock_gettime.c \
 	vasprintf.c \
 	setproctitle.c \
 	srandomdev.c \

Deleted: trunk/varnish-cache/lib/libcompat/clock_gettime.c
===================================================================
--- trunk/varnish-cache/lib/libcompat/clock_gettime.c	2007-07-19 11:01:36 UTC (rev 1716)
+++ trunk/varnish-cache/lib/libcompat/clock_gettime.c	2007-07-19 11:02:57 UTC (rev 1717)
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2007 Linpro AS
- * All rights reserved.
- *
- * Author: Dag-Erling Smørgrav <des at linpro.no>
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $Id$
- *
- */
-
-#ifndef HAVE_CLOCK_GETTIME
-
-#include <sys/time.h>
-
-#include <errno.h>
-#include <time.h>
-
-#include "compat/clock_gettime.h"
-
-int
-clock_gettime(clockid_t clk_id, struct timespec *tp)
-{
-	struct timeval tv;
-
-	switch (clk_id) {
-	case CLOCK_REALTIME:
-	case CLOCK_MONOTONIC:
-		if (gettimeofday(&tv, NULL) != 0)
-			return (-1);
-		tp->tv_sec = tv.tv_sec;
-		tp->tv_nsec = tv.tv_usec * 1000;
-		return (0);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-#endif