about summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-08-04 21:58:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-08-04 21:58:10 +0000
commit7c11c4a14684f23babd5060931529f095b8f81d3 (patch)
tree1376da71d6f5dc84720637524c52f902c23c4681 /stdio-common
parent01f7e9281469ade588b61111eac9911d9a48a1ff (diff)
downloadglibc-7c11c4a14684f23babd5060931529f095b8f81d3.tar.gz
glibc-7c11c4a14684f23babd5060931529f095b8f81d3.tar.xz
glibc-7c11c4a14684f23babd5060931529f095b8f81d3.zip
(do_release_all): Add __libc_freeres_fn_section.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/printf_size.c11
-rw-r--r--stdio-common/tst-fmemopen.c2
2 files changed, 2 insertions, 11 deletions
diff --git a/stdio-common/printf_size.c b/stdio-common/printf_size.c
index 3c7ac354e7..32f262ead0 100644
--- a/stdio-common/printf_size.c
+++ b/stdio-common/printf_size.c
@@ -201,18 +201,9 @@ printf_size (FILE *fp, const struct printf_info *info, const void *const *args)
 
   /* Prepare to print the number.  We want to use `__printf_fp' so we
      have to prepare a `printf_info' structure.  */
+  fp_info = *info;
   fp_info.spec = 'f';
   fp_info.prec = info->prec < 0 ? 3 : info->prec;
-  fp_info.is_long_double = info->is_long_double;
-  fp_info.is_short = info->is_short;
-  fp_info.is_long = info->is_long;
-  fp_info.alt = info->alt;
-  fp_info.space = info->space;
-  fp_info.left = info->left;
-  fp_info.showsign = info->showsign;
-  fp_info.group = info->group;
-  fp_info.extra = info->extra;
-  fp_info.pad = info->pad;
   fp_info.wide = wide;
 
   if (fp_info.left && fp_info.pad == L' ')
diff --git a/stdio-common/tst-fmemopen.c b/stdio-common/tst-fmemopen.c
index 84ded4f599..3c06c45c78 100644
--- a/stdio-common/tst-fmemopen.c
+++ b/stdio-common/tst-fmemopen.c
@@ -62,7 +62,7 @@ main (void)
     exit (4);
 
   if ((mmap_data = (char *) mmap (NULL, fs.st_size, PROT_READ,
-				  MAP_SHARED, fd, 0)) == NULL)
+				  MAP_SHARED, fd, 0)) == MAP_FAILED)
     {
       if (errno == ENOSYS)
 	exit (0);