From 0fce088cee476b60600f71d63c094206c3ea2b2c Mon Sep 17 00:00:00 2001 From: wollman Date: Mon, 17 Jun 2002 01:42:33 +0000 Subject: Move dillon's time conversion functions to a new header . Since they were never documented and have never appeared in a FreeBSD release, no repo-copy of the header is done. This removes namespace pollution from . --- include/Makefile | 4 +-- include/time.h | 11 -------- include/timeconv.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libc/stdtime/time32.c | 2 +- 4 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 include/timeconv.h diff --git a/include/Makefile b/include/Makefile index 234cbd8..54e71bb 100644 --- a/include/Makefile +++ b/include/Makefile @@ -20,8 +20,8 @@ INCS= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ ranlib.h readpassphrase.h regex.h regexp.h resolv.h rune.h runetype.h \ search.h setjmp.h sgtty.h \ signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \ - string.h stringlist.h strings.h sysexits.h tar.h time.h timers.h \ - ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h + string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \ + timers.h ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h diff --git a/include/time.h b/include/time.h index d82a5c2..beec150 100644 --- a/include/time.h +++ b/include/time.h @@ -124,17 +124,6 @@ time_t mktime(struct tm *); size_t strftime(char *, size_t, const char *, const struct tm *); time_t time(time_t *); -#if __BSD_VISIBLE /* XXX what are these? */ -time_t _time32_to_time(__int32_t t32); -__int32_t _time_to_time32(time_t t); -time_t _time64_to_time(__int64_t t64); -__int64_t _time_to_time64(time_t t); -long _time_to_long(time_t t); -time_t _long_to_time(long tlong); -int _time_to_int(time_t t); -time_t _int_to_time(int tint); -#endif /* not ANSI */ - #if __POSIX_VISIBLE void tzset(void); diff --git a/include/timeconv.h b/include/timeconv.h new file mode 100644 index 0000000..e76c4cd --- /dev/null +++ b/include/timeconv.h @@ -0,0 +1,65 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * (c) UNIX System Laboratories, Inc. + * All or some portions of this file are derived from material licensed + * to the University of California by American Telephone and Telegraph + * Co. or Unix System Laboratories, Inc. and are reproduced herein with + * the permission of UNIX System Laboratories, Inc. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. + * + * @(#)time.h 8.3 (Berkeley) 1/21/94 + */ + +/* + * $FreeBSD$ + */ + +#ifndef _TIMECONV_H_ +#define _TIMECONV_H_ + +#include +#include + +#ifdef _BSD_TIME_T_ +typedef _BSD_TIME_T_ time_t; +#undef _BSD_TIME_T_ +#endif + +time_t _time32_to_time(__int32_t t32); +__int32_t _time_to_time32(time_t t); +time_t _time64_to_time(__int64_t t64); +__int64_t _time_to_time64(time_t t); +long _time_to_long(time_t t); +time_t _long_to_time(long tlong); +int _time_to_int(time_t t); +time_t _int_to_time(int tint); + +#endif /* _TIMECONV_H_ */ diff --git a/lib/libc/stdtime/time32.c b/lib/libc/stdtime/time32.c index 9040fdc..e852a4f 100644 --- a/lib/libc/stdtime/time32.c +++ b/lib/libc/stdtime/time32.c @@ -15,7 +15,7 @@ __FBSDID("$FreeBSD$"); #include -#include +#include /* * Convert a 32 bit representation of time_t into time_t. XXX needs to -- cgit v1.1