Import perl-5.18.2

OK espie@ sthen@ deraadt@

7 files changed, 39 insertions, 39 deletions

diff --git a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/README b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/README
index 2659e0fa113..a5a23e00d3c 100644
--- a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/README
+++ b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/README
@@ -233,7 +233,7 @@ various inputs:
      */
     long
     dbm_hash(char *str, int len) {
-        register unsigned long n = 0;
+        unsigned long n = 0;
 
         while (len--)
             n = n * 65599 + *str++;
diff --git a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dba.c b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dba.c
index 74067763985..b27c3e66a47 100644
--- a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dba.c
+++ b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dba.c
@@ -42,11 +42,11 @@ main(int argc, char **argv)
 void
 sdump(int pagf)
 {
-	register b;
-	register n = 0;
-	register t = 0;
-	register o = 0;
-	register e;
+	int b;
+	int n = 0;
+	int t = 0;
+	int o = 0;
+	int e;
 	char pag[PBLKSIZ];
 
 	while ((b = read(pagf, pag, PBLKSIZ)) > 0) {
@@ -72,9 +72,9 @@ sdump(int pagf)
 int
 pagestat(char *pag)
 {
-	register n;
-	register free;
-	register short *ino = (short *) pag;
+	int n;
+	int free;
+	short *ino = (short *) pag;
 
 	if (!(n = ino[0]))
 		printf("no entries.\n");
diff --git a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbd.c b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbd.c
index 0a58d9a0f43..df27d174a80 100644
--- a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbd.c
+++ b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbd.c
@@ -44,9 +44,9 @@ main(int argc, char **argv)
 void
 sdump(int pagf)
 {
-	register r;
-	register n = 0;
-	register o = 0;
+	int r;
+	int n = 0;
+	int o = 0;
 	char pag[PBLKSIZ];
 
 	while ((r = read(pagf, pag, PBLKSIZ)) > 0) {
@@ -70,9 +70,9 @@ sdump(int pagf)
 int
 dispage(char *pag)
 {
-	register i, n;
-	register off;
-	register short *ino = (short *) pag;
+	int i, n;
+	int off;
+	int short *ino = (short *) pag;
 
 	off = PBLKSIZ;
 	for (i = 1; i < ino[0]; i += 2) {
@@ -92,9 +92,9 @@ dispage(char *pag)
 void
 dispage(char *pag)
 {
-	register i, n;
-	register off;
-	register short *ino = (short *) pag;
+	int i, n;
+	int off;
+	short *ino = (short *) pag;
 
 	off = PBLKSIZ;
 	for (i = 1; i < ino[0]; i += 2) {
diff --git a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbe.c b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbe.c
index f2aa29075a5..18ce54677e8 100644
--- a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbe.c
+++ b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbe.c
@@ -54,8 +54,8 @@ char *optarg;			       /* Global argument pointer. */
 char
 getopt(int argc, char **argv, char *optstring)
 {
-	register int c;
-	register char *place;
+	int c;
+	char *place;
 	extern char *index();
 	static int optind = 0;
 	static char *scan = NULL;
diff --git a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbu.c b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbu.c
index e68b78de44e..d861c0f1b19 100644
--- a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbu.c
+++ b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/dbu.c
@@ -68,7 +68,7 @@ int
 main(int argc, char **argv)
 {
 	int c;
-	register cmd *act;
+	cmd *act;
 	extern int optind;
 	extern char *optarg;
 
@@ -96,13 +96,13 @@ main(int argc, char **argv)
 }
 
 static void
-doit(register cmd *act, char *file)
+doit(cmd *act, char *file)
 {
 	datum key;
 	datum val;
-	register DBM *db;
-	register char *op;
-	register int n;
+	DBM *db;
+	char *op;
+	int n;
 	char *line;
 #ifdef TIME
 	long start;
@@ -195,7 +195,7 @@ doit(register cmd *act, char *file)
 static void
 badk(char *word)
 {
-	register int i;
+	int i;
 
 	if (progname)
 		fprintf(stderr, "%s: ", progname);
@@ -209,10 +209,10 @@ badk(char *word)
 }
 
 static cmd *
-parse(register char *str)
+parse(char *str)
 {
-	register int i = CTABSIZ;
-	register cmd *p;
+	int i = CTABSIZ;
+	cmd *p;
 	
 	for (p = cmds; i--; p++)
 		if (strcmp(p->sname, str) == 0)
@@ -223,9 +223,9 @@ parse(register char *str)
 static void
 prdatum(FILE *stream, datum d)
 {
-	register int c;
-	register char *p = d.dptr;
-	register int n = d.dsize;
+	int c;
+	char *p = d.dptr;
+	int n = d.dsize;
 
 	while (n--) {
 		c = *p++ & 0377;
diff --git a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/hash.c b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/hash.c
index 7dd1c99e354..f0115baa545 100644
--- a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/hash.c
+++ b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/hash.c
@@ -18,16 +18,16 @@
  *      65587   even better. 
  */
 long
-sdbm_hash(register const char *str, register int len)
+sdbm_hash(const char *str, int len)
 {
-	register unsigned long n = 0;
+	unsigned long n = 0;
 
 #ifdef DUFF
 
 #define HASHC	n = *str++ + 65599 * n
 
 	if (len > 0) {
-		register int loop = (len + 8 - 1) >> 3;
+		int loop = (len + 8 - 1) >> 3;
 
 		switch(len & (8 - 1)) {
 		case 0:	do {
diff --git a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/util.c b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/util.c
index 16bd4ac9a5c..a58085d559a 100644
--- a/gnu/usr.bin/perl/ext/SDBM_File/sdbm/util.c
+++ b/gnu/usr.bin/perl/ext/SDBM_File/sdbm/util.c
@@ -6,7 +6,7 @@
 #endif
 
 void
-oops(register char *s1, register char *s2)
+oops(char *s1, char *s2)
 {
 	extern int errno, sys_nerr;
 	extern char *sys_errlist[];
@@ -24,9 +24,9 @@ oops(register char *s1, register char *s2)
 int
 okpage(char *pag)
 {
-	register unsigned n;
-	register off;
-	register short *ino = (short *) pag;
+	unsigned n;
+	int off;
+	short *ino = (short *) pag;
 
 	if ((n = ino[0]) > PBLKSIZ / sizeof(short))
 		return 0;