summaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/printf-parsemb.c5
-rw-r--r--stdio-common/tst-fmemopen2.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/stdio-common/printf-parsemb.c b/stdio-common/printf-parsemb.c
index c55b97060c..2f21fc6365 100644
--- a/stdio-common/printf-parsemb.c
+++ b/stdio-common/printf-parsemb.c
@@ -1,5 +1,5 @@
/* Helper functions for parsing printf format strings.
- Copyright (C) 1995-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1995-2000,2002,2003,2004,2006 Free Software Foundation, Inc.
This file is part of th GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -64,7 +64,8 @@ __find_specmb (const UCHAR_T *format, mbstate_t *ps)
/* Remove any hints of a wrong encoding. */
ps->__count = 0;
- if (! isascii (*format) && (len = __mbrlen (format, MB_CUR_MAX, ps)) > 0)
+ if (! isascii (*format)
+ && (len = __mbrlen ((const CHAR_T *) format, MB_CUR_MAX, ps)) > 0)
format += len;
else
++format;
diff --git a/stdio-common/tst-fmemopen2.c b/stdio-common/tst-fmemopen2.c
index bcb136e8c1..81beddddef 100644
--- a/stdio-common/tst-fmemopen2.c
+++ b/stdio-common/tst-fmemopen2.c
@@ -28,7 +28,7 @@ do_test (void)
o = ftello (fp);
if (o != 0)
{
- printf ("second ftello returned %ld, expected %zu\n", o, 0);
+ printf ("second ftello returned %ld, expected %zu\n", o, (off_t) 0);
result = 1;
}
if (fseeko (fp, 0, SEEK_END) != 0)