* Remove 'register'. (some functions had 7+ register functions...)

* Fix SCM ID's.

16 files changed, 77 insertions, 68 deletions

diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
index 7a7dc68..d3920cc 100644
--- a/lib/libc/gen/alarm.c
+++ b/lib/libc/gen/alarm.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)alarm.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Backwards compatible alarm.
@@ -46,7 +48,7 @@ alarm(secs)
 	unsigned int secs;
 {
 	struct itimerval it, oitv;
-	register struct itimerval *itp = &it;
+	struct itimerval *itp = &it;
 
 	timerclear(&itp->it_interval);
 	itp->it_value.tv_sec = secs;
diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
index ab268cd..cbeb1d5 100644
--- a/lib/libc/gen/basename.c
+++ b/lib/libc/gen/basename.c
@@ -30,7 +30,6 @@
 static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
 #endif /* not lint */
 #endif
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -44,7 +43,7 @@ basename(path)
 	const char *path;
 {
 	static char bname[MAXPATHLEN];
-	register const char *endp, *startp;
+	const char *endp, *startp;
 
 	/* Empty or NULL string gets treated as "." */
 	if (path == NULL || *path == '\0') {
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
index 8012b06..5c05685 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libc/gen/crypt.c
@@ -36,8 +36,9 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from static char sccsid[] = "@(#)crypt.c	5.11 (Berkeley) 6/25/91"; */
-static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <unistd.h>
 #include <stdio.h>
@@ -55,7 +56,7 @@ __warn_references(des_setkey,
 
 int
 des_setkey(key)
-	register const char *key;
+	const char *key;
 {
 	fprintf(stderr, "WARNING!  des_setkey(3) not present in the system!\n");
 	return (0);
@@ -81,7 +82,7 @@ __warn_references(setkey,
 
 int
 setkey(key)
-	register const char *key;
+	const char *key;
 {
 	fprintf(stderr, "WARNING!  setkey(3) not present in the system!\n");
 	return (0);
@@ -92,7 +93,7 @@ __warn_references(encrypt,
 
 int
 encrypt(block, flag)
-	register char  *block;
+	char  *block;
 	int             flag;
 {
 	fprintf(stderr, "WARNING!  encrypt(3) not present in the system!\n");
diff --git a/lib/libc/gen/dirname.c b/lib/libc/gen/dirname.c
index c46b32e..8e287af 100644
--- a/lib/libc/gen/dirname.c
+++ b/lib/libc/gen/dirname.c
@@ -30,7 +30,6 @@
 static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
 #endif /* not lint */
 #endif
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -44,7 +43,7 @@ dirname(path)
 	const char *path;
 {
 	static char bname[MAXPATHLEN];
-	register const char *endp;
+	const char *endp;
 
 	/* Empty or NULL string gets treated as "." */
 	if (path == NULL || *path == '\0') {
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index cc28bb4..1cb8db7 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -32,12 +32,10 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include <sys/param.h>
@@ -199,8 +197,8 @@ execvp(name, argv)
 	char * const *argv;
 {
 	char **memp;
-	register int cnt, lp, ln;
-	register char *p;
+	int cnt, lp, ln;
+	char *p;
 	int eacces, save_errno;
 	char *bp, *cur, *path, buf[MAXPATHLEN];
 	struct stat sb;
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 3655388..98c35d5 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -29,13 +29,13 @@
  * 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.
- *
- * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include <sys/param.h>
@@ -59,12 +59,12 @@ getcwd(pt, size)
 	char *pt;
 	size_t size;
 {
-	register struct dirent *dp;
-	register DIR *dir = NULL;
-	register dev_t dev;
-	register ino_t ino;
-	register int first;
-	register char *bpt, *bup;
+	struct dirent *dp;
+	DIR *dir = NULL;
+	dev_t dev;
+	ino_t ino;
+	int first;
+	char *bpt, *bup;
 	struct stat s;
 	dev_t root_dev;
 	ino_t root_ino;
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index a26c86c..aad2ae9 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -32,13 +32,13 @@
  * 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.
- *
- * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getnetgrent.c	8.2 (Berkeley) 4/27/95";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <strings.h>
@@ -242,8 +242,8 @@ getnetgrent(hostp, userp, domp)
 void
 endnetgrent()
 {
-	register struct linelist *lp, *olp;
-	register struct netgrp *gp, *ogp;
+	struct linelist *lp, *olp;
+	struct netgrp *gp, *ogp;
 
 	lp = linehead;
 	while (lp) {
@@ -411,10 +411,10 @@ static int
 parse_netgrp(group)
 	char *group;
 {
-	register char *spos, *epos;
-	register int len, strpos;
+	char *spos, *epos;
+	int len, strpos;
 #ifdef DEBUG
-	register int fields;
+	int fields;
 #endif
 	char *pos, *gpos;
 	struct netgrp *grp;
@@ -522,8 +522,8 @@ static struct linelist *
 read_for_group(group)
 	char *group;
 {
-	register char *pos, *spos, *linep, *olinep;
-	register int len, olen;
+	char *pos, *spos, *linep, *olinep;
+	int len, olen;
 	int cont;
 	struct linelist *lp;
 	char line[LINSIZ + 2];
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 2070f83..82a01bb 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -32,13 +32,13 @@
  * 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.
- *
- * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 5/3/95";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include <sys/param.h>
@@ -164,7 +164,7 @@ int
 pclose(iop)
 	FILE *iop;
 {
-	register struct pid *cur, *last;
+	struct pid *cur, *last;
 	int omask;
 	int pstat;
 	pid_t pid;
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index e51c463..c0f63cd 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -29,13 +29,13 @@
  * 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.
- *
- * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)psignal.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Print the name of the signal indicated
@@ -52,7 +52,7 @@ psignal(sig, s)
 	unsigned int sig;
 	const char *s;
 {
-	register const char *c;
+	const char *c;
 
 	if (sig < NSIG)
 		c = sys_siglist[sig];
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index aea7f55..dbc7c2c 100644
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)pwcache.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
@@ -57,8 +59,8 @@ user_from_uid(uid, nouser)
 		char	name[UT_NAMESIZE + 1];
 	} c_uid[NCACHE];
 	static int pwopen;
-	register struct passwd *pw;
-	register struct ncache *cp;
+	struct passwd *pw;
+	struct ncache *cp;
 
 	cp = c_uid + (uid & MASK);
 	if (cp->uid != uid || !*cp->name) {
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index c145d0a..c7de17e 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)times.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -48,7 +50,7 @@ static char sccsid[] = "@(#)times.c	8.1 (Berkeley) 6/4/93";
 
 clock_t
 times(tp)
-	register struct tms *tp;
+	struct tms *tp;
 {
 	struct rusage ru;
 	struct timeval t;
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
index 74086ef..c9d5957 100644
--- a/lib/libc/gen/timezone.c
+++ b/lib/libc/gen/timezone.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)timezone.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -59,7 +61,7 @@ timezone(zone, dst)
 	int	zone,
 		dst;
 {
-	register char	*beg,
+	char	*beg,
 			*end;
 
 	if ( (beg = getenv("TZNAME")) ) {	/* set in environment */
@@ -109,11 +111,11 @@ static struct zone {
  */
 char *
 _tztab(zone,dst)
-	register int	zone;
+	int	zone;
 	int	dst;
 {
-	register struct zone	*zp;
-	register char	sign;
+	struct zone	*zp;
+	char	sign;
 
 	for (zp = zonetab; zp->offset != -1;++zp)	/* static tables */
 		if (zp->offset == zone) {
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
index 2f72ebb..2710e70 100644
--- a/lib/libc/gen/ttyslot.c
+++ b/lib/libc/gen/ttyslot.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ttyent.h>
 #include <stdio.h>
@@ -43,9 +45,9 @@ static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";
 int
 ttyslot()
 {
-	register struct ttyent *ttyp;
-	register int slot;
-	register char *p;
+	struct ttyent *ttyp;
+	int slot;
+	char *p;
 	int cnt;
 	char *name;
 
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
index ec49a2d..a004873 100644
--- a/lib/libc/gen/ualarm.c
+++ b/lib/libc/gen/ualarm.c
@@ -34,6 +34,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ualarm.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/time.h>
 #include <unistd.h>
@@ -47,8 +49,8 @@ static char sccsid[] = "@(#)ualarm.c	8.1 (Berkeley) 6/4/93";
  */
 unsigned
 ualarm(usecs, reload)
-	register unsigned usecs;
-	register unsigned reload;
+	unsigned usecs;
+	unsigned reload;
 {
 	struct itimerval new, old;
 
diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c
index a730692..6e81276 100644
--- a/lib/libc/gen/unvis.c
+++ b/lib/libc/gen/unvis.c
@@ -29,13 +29,13 @@
  * 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.
- *
- * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <vis.h>
@@ -241,10 +241,10 @@ unvis(cp, c, astate, flag)
 
 int
 strunvis(dst, src)
-	register char *dst;
-	register const char *src;
+	char *dst;
+	const char *src;
 {
-	register char c;
+	char c;
 	char *start = dst;
 	int state = 0;
 
@@ -272,10 +272,10 @@ strunvis(dst, src)
 
 int
 strunvisx(dst, src, flag)
-	register char *dst;
-	register const char *src;
+	char *dst;
+	const char *src;
 {
-	register char c;
+	char c;
 	char *start = dst;
 	int state = 0;
     
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
index 35f24bf..bc4903c 100644
--- a/lib/libc/gen/vis.c
+++ b/lib/libc/gen/vis.c
@@ -29,13 +29,13 @@
  * 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.
- *
- * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 7/19/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <limits.h>
@@ -50,9 +50,9 @@ static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 7/19/93";
  */
 char *
 vis(dst, c, flag, nextc)
-	register char *dst;
+	char *dst;
 	int c, nextc;
-	register int flag;
+	int flag;
 {
 	c = (unsigned char)c;
 
@@ -171,11 +171,11 @@ done:
  */
 int
 strvis(dst, src, flag)
-	register char *dst;
-	register const char *src;
+	char *dst;
+	const char *src;
 	int flag;
 {
-	register char c;
+	char c;
 	char *start;
 
 	for (start = dst; (c = *src); )
@@ -186,9 +186,9 @@ strvis(dst, src, flag)
 
 int
 strvisx(dst, src, len, flag)
-	register char *dst;
-	register const char *src;
-	register size_t len;
+	char *dst;
+	const char *src;
+	size_t len;
 	int flag;
 {
 	int c;