Module Name: src
Committed By: matt
Date: Tue Mar 20 16:39:08 UTC 2012
Modified Files:
src/lib/libc/time: difftime.c localtime.c strftime.c
Log Message:
Remove use of __P
Switch to using C89 definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/difftime.c
cvs rdiff -u -r1.66 -r1.67 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/time/strftime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/difftime.c
diff -u src/lib/libc/time/difftime.c:1.10 src/lib/libc/time/difftime.c:1.11
--- src/lib/libc/time/difftime.c:1.10 Thu Dec 31 22:49:16 2009
+++ src/lib/libc/time/difftime.c Tue Mar 20 16:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: difftime.c,v 1.10 2009/12/31 22:49:16 mlelstv Exp $ */
+/* $NetBSD: difftime.c,v 1.11 2012/03/20 16:39:08 matt Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = "@(#)difftime.c 8.1";
#else
-__RCSID("$NetBSD: difftime.c,v 1.10 2009/12/31 22:49:16 mlelstv Exp $");
+__RCSID("$NetBSD: difftime.c,v 1.11 2012/03/20 16:39:08 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -19,9 +19,7 @@ __RCSID("$NetBSD: difftime.c,v 1.10 2009
#include "private.h" /* for time_t, TYPE_INTEGRAL, and TYPE_SIGNED */
double
-difftime(time1, time0)
-const time_t time1;
-const time_t time0;
+difftime(const time_t time1, const time_t time0)
{
/*
** If (sizeof (double) > sizeof (time_t)) simply convert and subtract
Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.66 src/lib/libc/time/localtime.c:1.67
--- src/lib/libc/time/localtime.c:1.66 Tue Mar 13 21:13:48 2012
+++ src/lib/libc/time/localtime.c Tue Mar 20 16:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.66 2012/03/13 21:13:48 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.67 2012/03/20 16:39:08 matt Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.66 2012/03/13 21:13:48 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.67 2012/03/20 16:39:08 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -659,8 +659,7 @@ static const int year_lengths[2] = {
*/
static const char *
-getzname(strp)
-const char * strp;
+getzname(const char *strp)
{
char c;
@@ -697,11 +696,7 @@ getqzname(const char *strp, const int de
*/
static const char *
-getnum(strp, nump, min, max)
-const char * strp;
-int * const nump;
-const int min;
-const int max;
+getnum(const char *strp, int * const nump, const int min, const int max)
{
char c;
int num;
Index: src/lib/libc/time/strftime.c
diff -u src/lib/libc/time/strftime.c:1.21 src/lib/libc/time/strftime.c:1.22
--- src/lib/libc/time/strftime.c:1.21 Thu Dec 16 18:38:07 2010
+++ src/lib/libc/time/strftime.c Tue Mar 20 16:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: strftime.c,v 1.21 2010/12/16 18:38:07 christos Exp $ */
+/* $NetBSD: strftime.c,v 1.22 2012/03/20 16:39:08 matt Exp $ */
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
@@ -6,7 +6,7 @@
static char elsieid[] = "@(#)strftime.c 7.64";
static char elsieid[] = "@(#)strftime.c 8.3";
#else
-__RCSID("$NetBSD: strftime.c,v 1.21 2010/12/16 18:38:07 christos Exp $");
+__RCSID("$NetBSD: strftime.c,v 1.22 2012/03/20 16:39:08 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -585,11 +585,8 @@ strftime(char * const s, const size_t ma
}
static char *
-_conv(n, format, pt, ptlim)
-const int n;
-const char * const format;
-char * const pt;
-const char * const ptlim;
+_conv(const int n, const char * const format, char * const pt,
+ const char * const ptlim)
{
char buf[INT_STRLEN_MAXIMUM(int) + 1];
@@ -598,10 +595,7 @@ const char * const ptlim;
}
static char *
-_add(str, pt, ptlim)
-const char * str;
-char * pt;
-const char * const ptlim;
+_add(const char *str, char *pt, const char * const ptlim)
{
while (pt < ptlim && (*pt = *str++) != '\0')
++pt;
@@ -617,13 +611,8 @@ const char * const ptlim;
*/
static char *
-_yconv(a, b, convert_top, convert_yy, pt, ptlim)
-const int a;
-const int b;
-const int convert_top;
-const int convert_yy;
-char * pt;
-const char * const ptlim;
+_yconv(const int a, const int b, const int convert_top, const int convert_yy,
+ char *pt, const char * const ptlim)
{
register int lead;
register int trail;
