From 894b6ab0099e7d9ca2ad9acb75246cd0a4542167 Mon Sep 17 00:00:00 2001
From: pat <>
Date: Wed, 30 Mar 2005 18:51:49 +0000
Subject: ansi + de-register

ok otto deraadt
---
 src/lib/libc/stdlib/radixsort.c | 42 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

(limited to 'src/lib/libc/stdlib/radixsort.c')

diff --git a/src/lib/libc/stdlib/radixsort.c b/src/lib/libc/stdlib/radixsort.c
index 1ff30416d9..96392ea73a 100644
--- a/src/lib/libc/stdlib/radixsort.c
+++ b/src/lib/libc/stdlib/radixsort.c
@@ -31,7 +31,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: radixsort.c,v 1.6 2003/06/02 20:18:38 millert Exp $";
+static char *rcsid = "$OpenBSD: radixsort.c,v 1.7 2005/03/30 18:51:49 pat Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -85,10 +85,7 @@ static void r_sort_b(const u_char **,
 }
 
 int
-radixsort(a, n, tab, endch)
-	const u_char **a, *tab;
-	int n;
-	u_int endch;
+radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
 {
 	const u_char *tr;
 	int c;
@@ -100,10 +97,7 @@ radixsort(a, n, tab, endch)
 }
 
 int
-sradixsort(a, n, tab, endch)
-	const u_char **a, *tab;
-	int n;
-	u_int endch;
+sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
 {
 	const u_char *tr, **ta;
 	int c;
@@ -128,15 +122,11 @@ sradixsort(a, n, tab, endch)
 
 /* Unstable, in-place sort. */
 void
-r_sort_a(a, n, i, tr, endch)
-	const u_char **a;
-	int n, i;
-	const u_char *tr;
-	u_int endch;
+r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
 {
 	static int count[256], nc, bmin;
-	register int c;
-	register const u_char **ak, *r;
+	int c;
+	const u_char **ak, *r;
 	stack s[SIZE], *sp, *sp0, *sp1, temp;
 	int *cp, bigc;
 	const u_char **an, *t, **aj, **top[256];
@@ -219,15 +209,12 @@ r_sort_a(a, n, i, tr, endch)
 
 /* Stable sort, requiring additional memory. */
 void
-r_sort_b(a, ta, n, i, tr, endch)
-	const u_char **a, **ta;
-	int n, i;
-	const u_char *tr;
-	u_int endch;
+r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
+    u_int endch)
 {
 	static int count[256], nc, bmin;
-	register int c;
-	register const u_char **ak, **ai;
+	int c;
+	const u_char **ak, **ai;
 	stack s[512], *sp, *sp0, *sp1, temp;
 	const u_char **top[256];
 	int *cp, bigc;
@@ -291,13 +278,10 @@ r_sort_b(a, ta, n, i, tr, endch)
 }
 		
 static __inline void
-simplesort(a, n, b, tr, endch)	/* insertion sort */
-	register const u_char **a;
-	int n, b;
-	register const u_char *tr;
-	u_int endch;
+simplesort(const u_char **a, int n, int b, const u_char *tr, u_int endch)
+    /* insertion sort */
 {
-	register u_char ch;
+	u_char ch;
 	const u_char  **ak, **ai, *s, *t;
 
 	for (ak = a+1; --n >= 1; ak++)
-- 
cgit v1.2.3-55-g6feb