aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-08-28 10:16:21 +0000
committerUlrich Drepper <drepper@redhat.com>2002-08-28 10:16:21 +0000
commit4124ff9971b78f172ee2a8ec07a5542d7a5a56d5 (patch)
tree224e219a6b6340f2693fd037b0b84d298dccc3d5
parent05b2fb299d70224cf81c51beb987b8ad97054058 (diff)
downloadglibc-4124ff9971b78f172ee2a8ec07a5542d7a5a56d5.tar
glibc-4124ff9971b78f172ee2a8ec07a5542d7a5a56d5.tar.gz
glibc-4124ff9971b78f172ee2a8ec07a5542d7a5a56d5.tar.bz2
glibc-4124ff9971b78f172ee2a8ec07a5542d7a5a56d5.zip
(strtol): Add some more casts to avoid warnings.
-rw-r--r--stdlib/fmtmsg.c6
-rw-r--r--stdlib/strtod.c4
-rw-r--r--sysdeps/generic/strtol.c8
3 files changed, 9 insertions, 9 deletions
diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
index bb8502f00b..660df1fdcb 100644
--- a/stdlib/fmtmsg.c
+++ b/stdlib/fmtmsg.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -162,7 +162,7 @@ fmtmsg (long int classification, const char *label, int severity,
do_action ? "TO FIX: " : "",
do_action ? action : "",
do_action && do_tag ? " " : "",
- do_tag ? tag : "") == WEOF)
+ do_tag ? tag : "") < 0)
/* Oh, oh. An error occurred during the output. */
result = MM_NOMSG;
}
@@ -179,7 +179,7 @@ fmtmsg (long int classification, const char *label, int severity,
do_action ? "TO FIX: " : "",
do_action ? action : "",
do_action && do_tag ? " " : "",
- do_tag ? tag : "") == EOF)
+ do_tag ? tag : "") < 0)
/* Oh, oh. An error occurred during the output. */
result = MM_NOMSG;
}
diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index 518b171f09..63a3a9749d 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -676,8 +676,8 @@ INTERNAL (STRTOF) (nptr, endptr, group LOCALE_PARAM)
/* If no other digit but a '0' is found the result is 0.0.
Return current read pointer. */
if ((c < L_('0') || c > L_('9'))
- && (base == 16 && (c < (wint_t) TOLOWER (L_('a'))
- || c > (wint_t) TOLOWER (L_('f'))))
+ && (base == 16 && (c < (CHAR_TYPE) TOLOWER (L_('a'))
+ || c > (CHAR_TYPE) TOLOWER (L_('f'))))
#ifdef USE_WIDE_CHAR
&& c != (wint_t) decimal
#else
diff --git a/sysdeps/generic/strtol.c b/sysdeps/generic/strtol.c
index 28806083cf..1b267753d9 100644
--- a/sysdeps/generic/strtol.c
+++ b/sysdeps/generic/strtol.c
@@ -361,9 +361,9 @@ INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
)
{
for (c = *end; c != L_('\0'); c = *++end)
- if (((wchar_t) c < L_('0') || (wchar_t) c > L_('9'))
+ if (((STRING_TYPE) c < L_('0') || (STRING_TYPE) c > L_('9'))
# ifdef USE_WIDE_CHAR
- && c != thousands
+ && (wchar_t) c != thousands
# else
&& ({ for (cnt = 0; cnt < thousands_len; ++cnt)
if (thousands[cnt] != end[cnt])
@@ -400,7 +400,7 @@ INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
c -= L_('0');
#ifdef USE_NUMBER_GROUPING
# ifdef USE_WIDE_CHAR
- else if (grouping && c == thousands)
+ else if (grouping && (wchar_t) c == thousands)
continue;
# else
else if (thousands_len)
@@ -448,7 +448,7 @@ INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
c -= L_('0');
#ifdef USE_NUMBER_GROUPING
# ifdef USE_WIDE_CHAR
- else if (grouping && c == thousands)
+ else if (grouping && (wchar_t) c == thousands)
continue;
# else
else if (thousands_len)