[src/trunk]: src/common/lib/libc/stdlib match variable names with man page (K...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4594d091af67
branches:  trunk
changeset: 335640:4594d091af67
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 18 17:55:22 2015 +0000

description:
match variable names with man page (Kamil Rytarowski)

diffstat:

 common/lib/libc/stdlib/_strtoi.h |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (81 lines):

diff -r f9a546eb9003 -r 4594d091af67 common/lib/libc/stdlib/_strtoi.h
--- a/common/lib/libc/stdlib/_strtoi.h  Sun Jan 18 17:37:54 2015 +0000
+++ b/common/lib/libc/stdlib/_strtoi.h  Sun Jan 18 17:55:22 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: _strtoi.h,v 1.1 2015/01/16 18:35:28 christos Exp $     */
+/*     $NetBSD: _strtoi.h,v 1.2 2015/01/18 17:55:22 christos Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -51,7 +51,7 @@
 #if defined(_KERNEL) || defined(_STANDALONE) || \
     defined(HAVE_NBTOOL_CONFIG_H) || defined(BCS_ONLY)
 __TYPE
-_FUNCNAME(const char * __restrict ptr, char ** __restrict endptr, int base,
+_FUNCNAME(const char * __restrict nptr, char ** __restrict endptr, int base,
           __TYPE lo, __TYPE hi, int * rstatus)
 #else
 #include <locale.h>
@@ -60,7 +60,7 @@
 #define INT_FUNCNAME(pre, name, post)  INT_FUNCNAME_(pre, name, post)
 
 static __TYPE
-INT_FUNCNAME(_int_, _FUNCNAME, _l)(const char * __restrict ptr,
+INT_FUNCNAME(_int_, _FUNCNAME, _l)(const char * __restrict nptr,
     char ** __restrict endptr, int base,
     __TYPE lo, __TYPE hi, int * rstatus, locale_t loc)
 #endif
@@ -74,7 +74,7 @@
 
        _DIAGASSERT(hi >= lo);
 
-       _DIAGASSERT(ptr != NULL);
+       _DIAGASSERT(nptr != NULL);
        /* endptr may be NULL */
 
        if (endptr == NULL)
@@ -90,9 +90,9 @@
 
 #if defined(_KERNEL) || defined(_STANDALONE) || \
     defined(HAVE_NBTOOL_CONFIG_H) || defined(BCS_ONLY)
-       im = __WRAPPED(ptr, endptr, base);
+       im = __WRAPPED(nptr, endptr, base);
 #else
-       im = __WRAPPED_L(ptr, endptr, base, loc);
+       im = __WRAPPED_L(nptr, endptr, base, loc);
 #endif
 
 #if !defined(_KERNEL) && !defined(_STANDALONE)
@@ -102,7 +102,7 @@
 
        if (*rstatus == 0) {
                /* No digits were found */
-               if (ptr == *endptr)
+               if (nptr == *endptr)
                        *rstatus = ECANCELED;
                /* There are further characters after number */
                else if (**endptr != '\0')
@@ -126,19 +126,19 @@
 #if !defined(_KERNEL) && !defined(_STANDALONE) && \
     !defined(HAVE_NBTOOL_CONFIG_H) && !defined(BCS_ONLY)
 __TYPE
-_FUNCNAME(const char * __restrict ptr, char ** __restrict endptr, int base,
+_FUNCNAME(const char * __restrict nptr, char ** __restrict endptr, int base,
     __TYPE lo, __TYPE hi, int * rstatus)
 {
-       return INT_FUNCNAME(_int_, _FUNCNAME, _l)(ptr, endptr, base, lo, hi,
+       return INT_FUNCNAME(_int_, _FUNCNAME, _l)(nptr, endptr, base, lo, hi,
            rstatus, _current_locale());
 }
 
 __TYPE
-INT_FUNCNAME(, _FUNCNAME, _l)(const char * __restrict ptr,
+INT_FUNCNAME(, _FUNCNAME, _l)(const char * __restrict nptr,
     char ** __restrict endptr, int base,
     __TYPE lo, __TYPE hi, int * rstatus, locale_t loc)
 {
-       return INT_FUNCNAME(_int_, _FUNCNAME, _l)(ptr, endptr, base, lo, hi,
+       return INT_FUNCNAME(_int_, _FUNCNAME, _l)(nptr, endptr, base, lo, hi,
            rstatus, loc);
 }
 #endif