diff options
author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
tree | f64a4ace625514e94759878c0b94ab0a79805bbd /openbsd-compat/strtoul.c | |
parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'openbsd-compat/strtoul.c')
-rw-r--r-- | openbsd-compat/strtoul.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/openbsd-compat/strtoul.c b/openbsd-compat/strtoul.c index 24d0e253d..8219c8391 100644 --- a/openbsd-compat/strtoul.c +++ b/openbsd-compat/strtoul.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */ | 1 | /* $OpenBSD: strtoul.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */ |
2 | |||
3 | /* | 2 | /* |
4 | * Copyright (c) 1990 Regents of the University of California. | 3 | * Copyright (c) 1990 Regents of the University of California. |
5 | * All rights reserved. | 4 | * All rights reserved. |
@@ -29,13 +28,11 @@ | |||
29 | * SUCH DAMAGE. | 28 | * SUCH DAMAGE. |
30 | */ | 29 | */ |
31 | 30 | ||
31 | /* OPENBSD ORIGINAL: lib/libc/stdlib/strtoul.c */ | ||
32 | |||
32 | #include "includes.h" | 33 | #include "includes.h" |
33 | #ifndef HAVE_STRTOUL | 34 | #ifndef HAVE_STRTOUL |
34 | 35 | ||
35 | #if defined(LIBC_SCCS) && !defined(lint) | ||
36 | static char *rcsid = "$OpenBSD: strtoul.c,v 1.5 2003/06/02 20:18:38 millert Exp $"; | ||
37 | #endif /* LIBC_SCCS and not lint */ | ||
38 | |||
39 | #include <ctype.h> | 36 | #include <ctype.h> |
40 | #include <errno.h> | 37 | #include <errno.h> |
41 | #include <limits.h> | 38 | #include <limits.h> |
@@ -48,15 +45,12 @@ static char *rcsid = "$OpenBSD: strtoul.c,v 1.5 2003/06/02 20:18:38 millert Exp | |||
48 | * alphabets and digits are each contiguous. | 45 | * alphabets and digits are each contiguous. |
49 | */ | 46 | */ |
50 | unsigned long | 47 | unsigned long |
51 | strtoul(nptr, endptr, base) | 48 | strtoul(const char *nptr, char **endptr, int base) |
52 | const char *nptr; | ||
53 | char **endptr; | ||
54 | register int base; | ||
55 | { | 49 | { |
56 | register const char *s; | 50 | const char *s; |
57 | register unsigned long acc, cutoff; | 51 | unsigned long acc, cutoff; |
58 | register int c; | 52 | int c; |
59 | register int neg, any, cutlim; | 53 | int neg, any, cutlim; |
60 | 54 | ||
61 | /* | 55 | /* |
62 | * See strtol for comments as to the logic used. | 56 | * See strtol for comments as to the logic used. |