summaryrefslogtreecommitdiff
path: root/lib/xstrtol.h
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1996-10-29 14:14:08 +0000
committerJim Meyering <jim@meyering.net>1996-10-29 14:14:08 +0000
commit5b08577168f0343751bcec977335dac4eaa45949 (patch)
treecdb5eb44dfa428cd65a68af5b5f29214fdeaf8b2 /lib/xstrtol.h
parentf820ac46f4f61390b3fafde7f0e55b97dc605052 (diff)
downloadgnulib-5b08577168f0343751bcec977335dac4eaa45949.tar.gz
libitize
Diffstat (limited to 'lib/xstrtol.h')
-rw-r--r--lib/xstrtol.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index e710a09ac7..baea032db0 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -15,9 +15,9 @@
#undef PARAMS
#if defined (__STDC__) && __STDC__
-# define PARAMS(x) x
+# define PARAMS(Args) Args
#else
-# define PARAMS(x) ()
+# define PARAMS(Args) ()
#endif
enum strtol_error
@@ -30,37 +30,37 @@ strtol_error
__xstrtol PARAMS ((const char *s, char **ptr, int base,
__unsigned long int *val, const char *valid_suffixes));
-#define _STRTOL_ERROR(exit_code, str, argument_type_string, err) \
+#define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err) \
do \
{ \
- switch ((err)) \
+ switch ((Err)) \
{ \
case LONGINT_OK: \
abort (); \
\
case LONGINT_INVALID: \
- error ((exit_code), 0, "invalid %s `%s'", \
- (argument_type_string), (str)); \
+ error ((Exit_code), 0, "invalid %s `%s'", \
+ (Argument_type_string), (Str)); \
break; \
\
case LONGINT_INVALID_SUFFIX_CHAR: \
- error ((exit_code), 0, "invalid character following %s `%s'", \
- (argument_type_string), (str)); \
+ error ((Exit_code), 0, "invalid character following %s `%s'", \
+ (Argument_type_string), (Str)); \
break; \
\
case LONGINT_OVERFLOW: \
/* FIXME: make this message dependent on STRING_TO_UNSIGNED */\
- error ((exit_code), 0, "%s `%s' larger than maximum long int",\
- (argument_type_string), (str)); \
+ error ((Exit_code), 0, "%s `%s' larger than maximum long int",\
+ (Argument_type_string), (Str)); \
break; \
} \
} \
while (0)
-#define STRTOL_FATAL_ERROR(str, argument_type_string, err) \
- _STRTOL_ERROR (2, str, argument_type_string, err)
+#define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err) \
+ _STRTOL_ERROR (2, Str, Argument_type_string, Err)
-#define STRTOL_FAIL_WARN(str, argument_type_string, err) \
- _STRTOL_ERROR (0, str, argument_type_string, err)
+#define STRTOL_FAIL_WARN(Str, Argument_type_string, Err) \
+ _STRTOL_ERROR (0, Str, Argument_type_string, Err)
#endif /* _xstrtol_h_ */