diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3 deleted file mode 100644 index 48eb465aed..0000000000 --- a/lib/libcompat/4.1/ftime.3 +++ /dev/null @@ -1,80 +0,0 @@ -.\" Copyright (c) 1980, 1991, 1993 -.\" The Regents of the University of California. 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 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. -.\" -.\" @(#)ftime.3 8.1 (Berkeley) 6/4/93 -.\" -.Dd August 4, 2018 -.Dt FTIME 3 -.Os -.Sh NAME -.Nm ftime -.Nd get date and time -.Sh LIBRARY -.Lb libcompat -.Sh SYNOPSIS -.In sys/types.h -.In sys/timeb.h -.Ft int -.Fn ftime "struct timeb *tp" -.Sh DESCRIPTION -.Bf -symbolic -This interface is obsoleted by -.Xr gettimeofday 2 . -.Ef -.Pp -The -.Fn ftime -routine fills in a structure pointed to by its argument, -as defined by -.In sys/timeb.h : -.Bd -literal -offset indent -/* - * Structure returned by ftime system call - */ -struct timeb -{ - time_t time; - unsigned short millitm; - short timezone; - short dstflag; -}; -.Ed -.Pp -The structure contains the time since the epoch in seconds, -up to 1000 milliseconds of more-precise interval, -The kernel no longer maintains the timezone and dstflag info, so 0 is -always returned for these fields. -.Sh SEE ALSO -.Xr gettimeofday 2 , -.Xr settimeofday 2 , -.Xr ctime 3 , -.Xr time 3 -.Sh HISTORY -The -.Nm -function appeared in -.At v7 . diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c deleted file mode 100644 index 5ea57bca40..0000000000 --- a/lib/libcompat/4.1/ftime.c +++ /dev/null @@ -1,52 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * - * Copyright (c) 1994 Christopher G. Demetriou - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christopher G. Demetriou. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -#include -#include -#include -#include - -int -ftime(struct timeb *tbp) -{ - struct timezone tz; - struct timeval t; - - if (gettimeofday(&t, &tz) < 0) - return (-1); - tbp->millitm = t.tv_usec / 1000; - tbp->time = t.tv_sec; - tbp->timezone = tz.tz_minuteswest; - tbp->dstflag = tz.tz_dsttime; - - return (0); -} diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 7c99556e75..e30e120c3d 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -7,12 +7,7 @@ NO_PIC= WARNS?= 0 -.PATH: ${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4 - -# compat 4.1 sources -SRCS+= ftime.c - -MAN+= 4.1/ftime.3 +.PATH: ${.CURDIR}/4.3 ${.CURDIR}/4.4 # compat 4.3 sources SRCS+= re_comp.c rexec.c diff --git a/lib/libutil/ftime.c b/lib/libutil/ftime.c index b31fca9078..2e72b5ef30 100644 --- a/lib/libutil/ftime.c +++ b/lib/libutil/ftime.c @@ -30,7 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h index 952a5e83b8..853541e27a 100644 --- a/sys/sys/timeb.h +++ b/sys/sys/timeb.h @@ -39,7 +39,7 @@ #ifndef _SYS_TIMEB_H_ #define _SYS_TIMEB_H_ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_IN_LIBUITL) #warning "this file includes which is deprecated" #endif