svn commit: r325988 - head/sys/libkern
Ed Maste
emaste at FreeBSD.org
Sun Nov 19 00:31:17 UTC 2017
Author: emaste
Date: Sun Nov 19 00:31:13 2017
New Revision: 325988
URL: https://svnweb.freebsd.org/changeset/base/325988
Log:
ANSIfy sys/libkern
PR: 223641
Submitted by: ota at j.email.ne.jp
MFC after: 1 week
Modified:
head/sys/libkern/ashrdi3.c
head/sys/libkern/bcmp.c
head/sys/libkern/bsearch.c
head/sys/libkern/cmpdi2.c
head/sys/libkern/divdi3.c
head/sys/libkern/lshrdi3.c
head/sys/libkern/mcount.c
head/sys/libkern/moddi3.c
head/sys/libkern/qdivrem.c
head/sys/libkern/random.c
head/sys/libkern/scanc.c
head/sys/libkern/strcmp.c
head/sys/libkern/strlcat.c
head/sys/libkern/strsep.c
head/sys/libkern/strtol.c
head/sys/libkern/strtoul.c
head/sys/libkern/ucmpdi2.c
head/sys/libkern/udivdi3.c
head/sys/libkern/umoddi3.c
Modified: head/sys/libkern/ashrdi3.c
==============================================================================
--- head/sys/libkern/ashrdi3.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/ashrdi3.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -40,9 +40,7 @@ __FBSDID("$FreeBSD$");
* Shift a (signed) quad value right (arithmetic shift right).
*/
quad_t
-__ashrdi3(a, shift)
- quad_t a;
- qshift_t shift;
+__ashrdi3(quad_t a, qshift_t shift)
{
union uu aa;
Modified: head/sys/libkern/bcmp.c
==============================================================================
--- head/sys/libkern/bcmp.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/bcmp.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -42,9 +42,7 @@ typedef const unsigned long *culp;
* bcmp -- vax cmpc3 instruction
*/
int
-bcmp(b1, b2, length)
- const void *b1, *b2;
- size_t length;
+bcmp(const void *b1, const void *b2, size_t length)
{
#if BYTE_ORDER == LITTLE_ENDIAN
/*
Modified: head/sys/libkern/bsearch.c
==============================================================================
--- head/sys/libkern/bsearch.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/bsearch.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -53,12 +53,8 @@ __FBSDID("$FreeBSD$");
* look at item 3.
*/
void *
-bsearch(key, base0, nmemb, size, compar)
- const void *key;
- const void *base0;
- size_t nmemb;
- size_t size;
- int (*compar)(const void *, const void *);
+bsearch(const void *key, const void *base0, size_t nmemb, size_t size,
+ int (*compar)(const void *, const void *))
{
const char *base = base0;
size_t lim;
Modified: head/sys/libkern/cmpdi2.c
==============================================================================
--- head/sys/libkern/cmpdi2.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/cmpdi2.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -42,8 +42,7 @@ __FBSDID("$FreeBSD$");
* signed.
*/
int
-__cmpdi2(a, b)
- quad_t a, b;
+__cmpdi2(quad_t a, quad_t b)
{
union uu aa, bb;
Modified: head/sys/libkern/divdi3.c
==============================================================================
--- head/sys/libkern/divdi3.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/divdi3.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -41,8 +41,7 @@ __FBSDID("$FreeBSD$");
* ??? if -1/2 should produce -1 on this machine, this code is wrong
*/
quad_t
-__divdi3(a, b)
- quad_t a, b;
+__divdi3(quad_t a, quad_t b)
{
u_quad_t ua, ub, uq;
int neg;
Modified: head/sys/libkern/lshrdi3.c
==============================================================================
--- head/sys/libkern/lshrdi3.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/lshrdi3.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -40,9 +40,7 @@ __FBSDID("$FreeBSD$");
* Shift an (unsigned) quad value right (logical shift right).
*/
quad_t
-__lshrdi3(a, shift)
- quad_t a;
- qshift_t shift;
+__lshrdi3(quad_t a, qshift_t shift)
{
union uu aa;
Modified: head/sys/libkern/mcount.c
==============================================================================
--- head/sys/libkern/mcount.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/mcount.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -56,8 +56,7 @@ __FBSDID("$FreeBSD$");
* both frompcindex and frompc. Any reasonable, modern compiler will
* perform this optimization.
*/
-_MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
- uintfptr_t frompc, selfpc;
+_MCOUNT_DECL(uintfptr_t frompc, uintfptr_t selfpc) /* _mcount; may be static, inline, etc */
{
#ifdef GUPROF
int delta;
@@ -245,8 +244,7 @@ MCOUNT
#ifdef GUPROF
void
-mexitcount(selfpc)
- uintfptr_t selfpc;
+mexitcount(uintfptr_t selfpc)
{
struct gmonparam *p;
uintfptr_t selfpcdiff;
Modified: head/sys/libkern/moddi3.c
==============================================================================
--- head/sys/libkern/moddi3.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/moddi3.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -43,8 +43,7 @@ __FBSDID("$FreeBSD$");
* If -1/2 should produce -1 on this machine, this code is wrong.
*/
quad_t
-__moddi3(a, b)
- quad_t a, b;
+__moddi3(quad_t a, quad_t b)
{
u_quad_t ua, ub, ur;
int neg;
Modified: head/sys/libkern/qdivrem.c
==============================================================================
--- head/sys/libkern/qdivrem.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/qdivrem.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -77,8 +77,7 @@ __shl(digit *p, int len, int sh)
* leading zeros).
*/
u_quad_t
-__qdivrem(uq, vq, arq)
- u_quad_t uq, vq, *arq;
+__qdivrem(u_quad_t uq, u_quad_t vq, u_quad_t *arq)
{
union uu tmp;
digit *u, *v, *q;
Modified: head/sys/libkern/random.c
==============================================================================
--- head/sys/libkern/random.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/random.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -39,8 +39,7 @@ __FBSDID("$FreeBSD$");
static u_long randseed = 937186357; /* after srandom(1), NSHUFF counted */
void
-srandom(seed)
- u_long seed;
+srandom(u_long seed)
{
int i;
Modified: head/sys/libkern/scanc.c
==============================================================================
--- head/sys/libkern/scanc.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/scanc.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -35,10 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/libkern.h>
int
-scanc(size, cp, table, mask0)
- u_int size;
- const u_char *cp, table[];
- int mask0;
+scanc(u_int size, const u_char *cp, const u_char table[], int mask0)
{
const u_char *end;
u_char mask;
Modified: head/sys/libkern/strcmp.c
==============================================================================
--- head/sys/libkern/strcmp.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/strcmp.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -39,8 +39,7 @@ __FBSDID("$FreeBSD$");
* Compare strings.
*/
int
-strcmp(s1, s2)
- const char *s1, *s2;
+strcmp(const char *s1, const char *s2)
{
while (*s1 == *s2++)
if (*s1++ == 0)
Modified: head/sys/libkern/strlcat.c
==============================================================================
--- head/sys/libkern/strlcat.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/strlcat.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -44,10 +44,7 @@ __FBSDID("$FreeBSD$");
* If retval >= siz, truncation occurred.
*/
size_t
-strlcat(dst, src, siz)
- char *dst;
- const char *src;
- size_t siz;
+strlcat(char *dst, const char *src, size_t siz)
{
char *d = dst;
const char *s = src;
Modified: head/sys/libkern/strsep.c
==============================================================================
--- head/sys/libkern/strsep.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/strsep.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -48,9 +48,7 @@ __FBSDID("$FreeBSD$");
* If *stringp is NULL, strsep returns NULL.
*/
char *
-strsep(stringp, delim)
- char **stringp;
- const char *delim;
+strsep(char **stringp, const char *delim)
{
char *s;
const char *spanp;
Modified: head/sys/libkern/strtol.c
==============================================================================
--- head/sys/libkern/strtol.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/strtol.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -47,10 +47,7 @@ __FBSDID("$FreeBSD$");
* alphabets and digits are each contiguous.
*/
long
-strtol(nptr, endptr, base)
- const char *nptr;
- char **endptr;
- int base;
+strtol(const char *nptr, char **endptr, int base)
{
const char *s = nptr;
unsigned long acc;
Modified: head/sys/libkern/strtoul.c
==============================================================================
--- head/sys/libkern/strtoul.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/strtoul.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -47,10 +47,7 @@ __FBSDID("$FreeBSD$");
* alphabets and digits are each contiguous.
*/
unsigned long
-strtoul(nptr, endptr, base)
- const char *nptr;
- char **endptr;
- int base;
+strtoul(const char *nptr, char **endptr, int base)
{
const char *s = nptr;
unsigned long acc;
Modified: head/sys/libkern/ucmpdi2.c
==============================================================================
--- head/sys/libkern/ucmpdi2.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/ucmpdi2.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -41,8 +41,7 @@ __FBSDID("$FreeBSD$");
* Neither a nor b are considered signed.
*/
int
-__ucmpdi2(a, b)
- u_quad_t a, b;
+__ucmpdi2(u_quad_t a, u_quad_t b)
{
union uu aa, bb;
Modified: head/sys/libkern/udivdi3.c
==============================================================================
--- head/sys/libkern/udivdi3.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/udivdi3.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -40,8 +40,7 @@ __FBSDID("$FreeBSD$");
* Divide two unsigned quads.
*/
u_quad_t
-__udivdi3(a, b)
- u_quad_t a, b;
+__udivdi3(u_quad_t a, u_quad_t b)
{
return (__qdivrem(a, b, (u_quad_t *)0));
Modified: head/sys/libkern/umoddi3.c
==============================================================================
--- head/sys/libkern/umoddi3.c Sat Nov 18 21:39:54 2017 (r325987)
+++ head/sys/libkern/umoddi3.c Sun Nov 19 00:31:13 2017 (r325988)
@@ -40,8 +40,7 @@ __FBSDID("$FreeBSD$");
* Return remainder after dividing two unsigned quads.
*/
u_quad_t
-__umoddi3(a, b)
- u_quad_t a, b;
+__umoddi3(u_quad_t a, u_quad_t b)
{
u_quad_t r;
More information about the svn-src-head
mailing list