Module Name: src
Committed By: matt
Date: Tue Mar 20 16:21:41 UTC 2012
Modified Files:
src/common/lib/libc/gmon: mcount.c
src/common/lib/libc/md: md4c.c md5c.c
src/common/lib/libc/quad: qdivrem.c quad.h
Log Message:
Remove __P usage.
Convert to C89 prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/common/lib/libc/gmon/mcount.c
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/md/md4c.c \
src/common/lib/libc/md/md5c.c
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/quad/qdivrem.c
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/quad/quad.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gmon/mcount.c
diff -u src/common/lib/libc/gmon/mcount.c:1.9 src/common/lib/libc/gmon/mcount.c:1.10
--- src/common/lib/libc/gmon/mcount.c:1.9 Sat Mar 17 21:40:21 2012
+++ src/common/lib/libc/gmon/mcount.c Tue Mar 20 16:21:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mcount.c,v 1.9 2012/03/17 21:40:21 martin Exp $ */
+/* $NetBSD: mcount.c,v 1.10 2012/03/20 16:21:41 matt Exp $ */
/*
* Copyright (c) 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
#if 0
static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: mcount.c,v 1.9 2012/03/17 21:40:21 martin Exp $");
+__RCSID("$NetBSD: mcount.c,v 1.10 2012/03/20 16:21:41 matt Exp $");
#endif
#endif
@@ -94,7 +94,7 @@ struct gmonparam *_m_gmon_alloc(void);
#endif
#ifndef __LINT__
-_MCOUNT_DECL __P((u_long, u_long))
+_MCOUNT_DECL(u_long, u_long)
#ifdef _KERNEL
__attribute__((__no_instrument_function__))
#endif
@@ -127,8 +127,8 @@ _MCOUNT_DECL __P((u_long, u_long))
* perform this optimization.
*/
#ifndef __LINT__
-_MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
- u_long frompc, selfpc;
+/* _mcount; may be static, inline, etc */
+_MCOUNT_DECL(u_long frompc, u_long selfpc)
{
u_short *frompcindex;
struct tostruct *top, *prevtop;
Index: src/common/lib/libc/md/md4c.c
diff -u src/common/lib/libc/md/md4c.c:1.4 src/common/lib/libc/md/md4c.c:1.5
--- src/common/lib/libc/md/md4c.c:1.4 Mon Mar 16 05:59:21 2009
+++ src/common/lib/libc/md/md4c.c Tue Mar 20 16:21:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md4c.c,v 1.4 2009/03/16 05:59:21 cegger Exp $ */
+/* $NetBSD: md4c.c,v 1.5 2012/03/20 16:21:41 matt Exp $ */
/*
* This file is derived from the RSA Data Security, Inc. MD4 Message-Digest
@@ -31,7 +31,7 @@
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: md4c.c,v 1.4 2009/03/16 05:59:21 cegger Exp $");
+__RCSID("$NetBSD: md4c.c,v 1.5 2012/03/20 16:21:41 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -76,10 +76,10 @@ typedef uint32_t UINT4;
#define S33 11
#define S34 15
-static void MD4Transform __P((UINT4 [4], const unsigned char [64]));
+static void MD4Transform(UINT4 [4], const unsigned char [64]);
-static void Encode __P((unsigned char *, UINT4 *, unsigned int));
-static void Decode __P((UINT4 *, const unsigned char *, unsigned int));
+static void Encode(unsigned char *, UINT4 *, unsigned int);
+static void Decode(UINT4 *, const unsigned char *, unsigned int);
static const unsigned char PADDING[64] = {
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Index: src/common/lib/libc/md/md5c.c
diff -u src/common/lib/libc/md/md5c.c:1.4 src/common/lib/libc/md/md5c.c:1.5
--- src/common/lib/libc/md/md5c.c:1.4 Mon Mar 16 05:59:21 2009
+++ src/common/lib/libc/md/md5c.c Tue Mar 20 16:21:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md5c.c,v 1.4 2009/03/16 05:59:21 cegger Exp $ */
+/* $NetBSD: md5c.c,v 1.5 2012/03/20 16:21:41 matt Exp $ */
/*
* This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
@@ -36,7 +36,7 @@
#else
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: md5c.c,v 1.4 2009/03/16 05:59:21 cegger Exp $");
+__RCSID("$NetBSD: md5c.c,v 1.5 2012/03/20 16:21:41 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
#include <sys/types.h>
@@ -84,10 +84,10 @@ __weak_alias(MD5Final,_MD5Final)
__weak_alias(MD5Transform,_MD5Transform)
#endif
-static void MD5Transform __P((UINT4 [4], const unsigned char [64]));
+static void MD5Transform(UINT4 [4], const unsigned char [64]);
-static void Encode __P((unsigned char *, UINT4 *, unsigned int));
-static void Decode __P((UINT4 *, const unsigned char *, unsigned int));
+static void Encode(unsigned char *, UINT4 *, unsigned int);
+static void Decode(UINT4 *, const unsigned char *, unsigned int);
/*
* Encodes input (UINT4) into output (unsigned char). Assumes len is
Index: src/common/lib/libc/quad/qdivrem.c
diff -u src/common/lib/libc/quad/qdivrem.c:1.3 src/common/lib/libc/quad/qdivrem.c:1.4
--- src/common/lib/libc/quad/qdivrem.c:1.3 Fri Mar 9 15:41:16 2012
+++ src/common/lib/libc/quad/qdivrem.c Tue Mar 20 16:21:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: qdivrem.c,v 1.3 2012/03/09 15:41:16 christos Exp $ */
+/* $NetBSD: qdivrem.c,v 1.4 2012/03/20 16:21:41 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)qdivrem.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: qdivrem.c,v 1.3 2012/03/09 15:41:16 christos Exp $");
+__RCSID("$NetBSD: qdivrem.c,v 1.4 2012/03/20 16:21:41 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,7 +61,7 @@ typedef unsigned short digit;
typedef u_int digit;
#endif
-static void shl __P((digit *p, int len, int sh));
+static void shl(digit *p, int len, int sh);
/*
* __qdivrem(u, v, rem) returns u/v and, optionally, sets *rem to u%v.
Index: src/common/lib/libc/quad/quad.h
diff -u src/common/lib/libc/quad/quad.h:1.5 src/common/lib/libc/quad/quad.h:1.6
--- src/common/lib/libc/quad/quad.h:1.5 Fri Mar 9 15:41:16 2012
+++ src/common/lib/libc/quad/quad.h Tue Mar 20 16:21:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quad.h,v 1.5 2012/03/09 15:41:16 christos Exp $ */
+/* $NetBSD: quad.h,v 1.6 2012/03/20 16:21:41 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -110,35 +110,35 @@ typedef u_quad_t qshift_t;
#endif
__BEGIN_DECLS
-quad_t __adddi3 __P((quad_t, quad_t));
-quad_t __anddi3 __P((quad_t, quad_t));
-quad_t __ashldi3 __P((quad_t, qshift_t));
-quad_t __ashrdi3 __P((quad_t, qshift_t));
-int __cmpdi2 __P((quad_t, quad_t));
-quad_t __divdi3 __P((quad_t, quad_t));
-quad_t __fixtfdi __P((long double));
-quad_t __fixdfdi __P((double));
-quad_t __fixsfdi __P((float));
-u_quad_t __fixunstfdi __P((long double));
-u_quad_t __fixunsdfdi __P((double));
-u_quad_t __fixunssfdi __P((float));
-long double __floatditf __P((quad_t));
-double __floatdidf __P((quad_t));
-float __floatdisf __P((quad_t));
-long double __floatunditf __P((u_quad_t));
-double __floatundidf __P((u_quad_t));
-float __floatundisf __P((u_quad_t));
-quad_t __iordi3 __P((quad_t, quad_t));
-quad_t __lshldi3 __P((quad_t, qshift_t));
-quad_t __lshrdi3 __P((quad_t, qshift_t));
-quad_t __moddi3 __P((quad_t, quad_t));
-quad_t __muldi3 __P((quad_t, quad_t));
-quad_t __negdi2 __P((quad_t));
-quad_t __one_cmpldi2 __P((quad_t));
-u_quad_t __qdivrem __P((u_quad_t, u_quad_t, u_quad_t *));
-quad_t __subdi3 __P((quad_t, quad_t));
-int __ucmpdi2 __P((u_quad_t, u_quad_t));
-u_quad_t __udivdi3 __P((u_quad_t, u_quad_t ));
-u_quad_t __umoddi3 __P((u_quad_t, u_quad_t ));
-quad_t __xordi3 __P((quad_t, quad_t));
+quad_t __adddi3(quad_t, quad_t);
+quad_t __anddi3(quad_t, quad_t);
+quad_t __ashldi3(quad_t, qshift_t);
+quad_t __ashrdi3(quad_t, qshift_t);
+int __cmpdi2(quad_t, quad_t);
+quad_t __divdi3(quad_t, quad_t);
+quad_t __fixtfdi(long double);
+quad_t __fixdfdi(double);
+quad_t __fixsfdi(float);
+u_quad_t __fixunstfdi(long double);
+u_quad_t __fixunsdfdi(double);
+u_quad_t __fixunssfdi(float);
+long double __floatditf(quad_t);
+double __floatdidf(quad_t);
+float __floatdisf(quad_t);
+long double __floatunditf(u_quad_t);
+double __floatundidf(u_quad_t);
+float __floatundisf(u_quad_t);
+quad_t __iordi3(quad_t, quad_t);
+quad_t __lshldi3(quad_t, qshift_t);
+quad_t __lshrdi3(quad_t, qshift_t);
+quad_t __moddi3(quad_t, quad_t);
+quad_t __muldi3(quad_t, quad_t);
+quad_t __negdi2(quad_t);
+quad_t __one_cmpldi2(quad_t);
+u_quad_t __qdivrem(u_quad_t, u_quad_t, u_quad_t *);
+quad_t __subdi3(quad_t, quad_t);
+int __ucmpdi2(u_quad_t, u_quad_t);
+u_quad_t __udivdi3(u_quad_t, u_quad_t );
+u_quad_t __umoddi3(u_quad_t, u_quad_t );
+quad_t __xordi3(quad_t, quad_t);
__END_DECLS
