Import of OpenSSH 4.3p1

[gssapi-openssh.git] / openssh / openbsd-compat / strtoul.c

diff --git a/openssh/openbsd-compat/strtoul.c b/openssh/openbsd-compat/strtoul.c
index 24d0e253dd29239d3f88031bf36ce5cd85319789..8219c8391b31ad54cf868836ae2afc76de974682 100644 (file)
--- a/openssh/openbsd-compat/strtoul.c
+++ b/openssh/openbsd-compat/strtoul.c
@@ -1,5 +1,4 @@
-/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */
-
+/*     $OpenBSD: strtoul.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
 /*
  * Copyright (c) 1990 Regents of the University of California.
  * All rights reserved.
@@ -29,13 +28,11 @@
  * SUCH DAMAGE.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */
+
 #include "includes.h"
 #ifndef HAVE_STRTOUL
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strtoul.c,v 1.5 2003/06/02 20:18:38 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
@@ -48,15 +45,12 @@ static char *rcsid = "$OpenBSD: strtoul.c,v 1.5 2003/06/02 20:18:38 millert Exp
  * alphabets and digits are each contiguous.
  */
 unsigned long
-strtoul(nptr, endptr, base)
-       const char *nptr;
-       char **endptr;
-       register int base;
+strtoul(const char *nptr, char **endptr, int base)
 {
-       register const char *s;
-       register unsigned long acc, cutoff;
-       register int c;
-       register int neg, any, cutlim;
+       const char *s;
+       unsigned long acc, cutoff;
+       int c;
+       int neg, any, cutlim;
 
        /*
         * See strtol for comments as to the logic used.