From 3ba06713f8c2c40f3bf0cc9431352ba873701dcd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 4 Aug 2002 20:54:20 +0000 Subject: Update. 2002-08-04 Jakub Jelinek * manual/debug.texi: Fix spelling to programmatically. Reported by . * include/libio.h: Add libc_hidden_proto for __uflow. * include/stdio.h: Map fopen, fdopen, fclose, fputs, fsetpos, and fgetpos to _IO_* names. Add libc_hidden_proto for fileno, fwrite, fseek, fflush_unlocked, fread_unlocked, fwrite_unlocked, fgets_unlocked, fputs_unlocked. * include/wchar.h: Add libc_hidden_proto for fputws_unlocked, putwc_unlocked, vswscanf. * libio/iolibio.h: Add libc_hidden_proto for _IO_fputs. * libio/fileno.c: Use and libc_hidden_def. * libio/fseek.c: Likewise. * libio/fmemopen.c: Include "libioP.h". Call _IO_fopencookie and not fopencookie. * libio/genops.c (__uflow): Add libc_hidden_def. * libio/iofflush_u.c (fflush_unlocked): Likewise. * libio/iofgets_u.c (fgets_unlocked): Likewise. * libio/iofputs_u.c (fputs_unlocked): Likewise. * libio/iofputws_u.c (fputws_unlocked): Likewise. * libio/iofread_u.c (fread_unlocked): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iovswscanf.c (vswscanf): Likewise. * libio/putwc_u.c (putwc_unlocked): Likewise. * libio/iofputs.c: Use libc_hidden_def instead of INTDEF. * malloc/malloc.c: Redirect fwrite calls to _IO_fwrite. * malloc/mtrace.c: Likewise. * sunrpc/clnt_perr.c: Remove fputs macro. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * iconv/Makefile: Add CPPFLAGS definitions with -DNOT_in_libc for iconv_prog, linereader, and charmap-dir. * locale/Makefile: Likewise for locale and charmap-dir. * malloc/Makefile: Likewise for memusagestat. * nscd/Makefile: Likewise for nscd, nscd_conf, and dbg_log. * sunrpc/Makefile: Likewise for rpc_main. * sysdeps/unix/sysv/linux/Makefile: Likewise for lddlibc4. * timezone/Makefile: Likewise for zic. * stdio-common/perror.c: Avoid multiple calls to fileno_unlocked. --- libio/fileno.c | 5 +++-- libio/fmemopen.c | 6 ++++-- libio/fseek.c | 5 +++-- libio/genops.c | 3 ++- libio/iofflush_u.c | 1 + libio/iofgets_u.c | 1 + libio/iofputs.c | 2 +- libio/iofputs_u.c | 3 ++- libio/iofputws_u.c | 3 ++- libio/iofread_u.c | 1 + libio/iofwrite_u.c | 3 ++- libio/iolibio.h | 1 + libio/iovswscanf.c | 3 ++- libio/putwc_u.c | 3 ++- 14 files changed, 27 insertions(+), 13 deletions(-) (limited to 'libio') diff --git a/libio/fileno.c b/libio/fileno.c index 3b24cd0..036ddb1 100644 --- a/libio/fileno.c +++ b/libio/fileno.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ in files containing the exception. */ #include "libioP.h" -#include "stdio.h" +#include int fileno (fp) @@ -42,6 +42,7 @@ fileno (fp) return _IO_fileno (fp); } +libc_hidden_def (fileno) #ifdef _IO_MTSAFE_IO #ifdef weak_alias diff --git a/libio/fmemopen.c b/libio/fmemopen.c index 3afc049..a1c75f2 100644 --- a/libio/fmemopen.c +++ b/libio/fmemopen.c @@ -1,5 +1,5 @@ /* Fmemopen implementation. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Hanno Mueller, kontakt@hanno.de, 2000. @@ -75,6 +75,8 @@ #include #include #include +#include "libioP.h" + typedef struct fmemopen_cookie_struct fmemopen_cookie_t; struct fmemopen_cookie_struct @@ -237,5 +239,5 @@ fmemopen (void *buf, size_t len, const char *mode) iof.seek = fmemopen_seek; iof.close = fmemopen_close; - return fopencookie (c, mode, iof); + return _IO_fopencookie (c, mode, iof); } diff --git a/libio/fseek.c b/libio/fseek.c index ccb2238..831a4d4 100644 --- a/libio/fseek.c +++ b/libio/fseek.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1993,1995,1996,1997,1998,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ in files containing the exception. */ #include "libioP.h" -#include "stdio.h" +#include int fseek (fp, offset, whence) @@ -43,3 +43,4 @@ fseek (fp, offset, whence) _IO_cleanup_region_end (0); return result; } +libc_hidden_def (fseek) diff --git a/libio/genops.c b/libio/genops.c index eb03664..115c7df 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -383,11 +383,12 @@ __uflow (fp) INTUSE(_IO_free_backup_area) (fp); return _IO_UFLOW (fp); } +libc_hidden_def (__uflow) void _IO_setb (f, b, eb, a) _IO_FILE *f; - char *b; + char *b; char *eb; int a; { diff --git a/libio/iofflush_u.c b/libio/iofflush_u.c index 4603ec3..d604ebf 100644 --- a/libio/iofflush_u.c +++ b/libio/iofflush_u.c @@ -40,3 +40,4 @@ fflush_unlocked (fp) return _IO_SYNC (fp) ? EOF : 0; } } +libc_hidden_def (fflush_unlocked) diff --git a/libio/iofgets_u.c b/libio/iofgets_u.c index bf5bb09..ded2a7c 100644 --- a/libio/iofgets_u.c +++ b/libio/iofgets_u.c @@ -59,3 +59,4 @@ fgets_unlocked (buf, n, fp) fp->_IO_file_flags |= old_error; return result; } +libc_hidden_def (fgets_unlocked) diff --git a/libio/iofputs.c b/libio/iofputs.c index 0835e84..f2fd21d 100644 --- a/libio/iofputs.c +++ b/libio/iofputs.c @@ -45,7 +45,7 @@ _IO_fputs (str, fp) _IO_cleanup_region_end (0); return result; } -INTDEF(_IO_fputs) +libc_hidden_def (_IO_fputs) #ifdef weak_alias weak_alias (_IO_fputs, fputs) diff --git a/libio/iofputs_u.c b/libio/iofputs_u.c index 02427f8..475e533 100644 --- a/libio/iofputs_u.c +++ b/libio/iofputs_u.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1993,1996,1997,1998,1999,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -41,3 +41,4 @@ fputs_unlocked (str, fp) result = 1; return result; } +libc_hidden_def (fputs_unlocked) diff --git a/libio/iofputws_u.c b/libio/iofputws_u.c index bbfef09..a73f6b5 100644 --- a/libio/iofputws_u.c +++ b/libio/iofputws_u.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1996,1997,1998,1999,2000 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1996-2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -42,3 +42,4 @@ fputws_unlocked (str, fp) result = 1; return result; } +libc_hidden_def (fputws_unlocked) diff --git a/libio/iofread_u.c b/libio/iofread_u.c index 527af10..98c7ffd 100644 --- a/libio/iofread_u.c +++ b/libio/iofread_u.c @@ -45,3 +45,4 @@ fread_unlocked (buf, size, count, fp) bytes_read = INTUSE(_IO_sgetn) (fp, (char *) buf, bytes_requested); return bytes_requested == bytes_read ? count : bytes_read / size; } +libc_hidden_def (fread_unlocked) diff --git a/libio/iofwrite_u.c b/libio/iofwrite_u.c index e4e9733..738cc5b 100644 --- a/libio/iofwrite_u.c +++ b/libio/iofwrite_u.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1996-2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -51,3 +51,4 @@ fwrite_unlocked (buf, size, count, fp) return written / size; } +libc_hidden_def (fwrite_unlocked) diff --git a/libio/iolibio.h b/libio/iolibio.h index be04604..80fb527 100644 --- a/libio/iolibio.h +++ b/libio/iolibio.h @@ -25,6 +25,7 @@ extern _IO_FILE *__fopen_internal __P((const char*, const char*, int)); extern _IO_FILE *__fopen_maybe_mmap __P((_IO_FILE *)); extern int _IO_fprintf __P((_IO_FILE*, const char*, ...)); extern int _IO_fputs __P((const char*, _IO_FILE*)); +libc_hidden_proto (_IO_fputs) extern int _IO_fsetpos __P((_IO_FILE*, const _IO_fpos_t *)); extern int _IO_fsetpos64 __P((_IO_FILE*, const _IO_fpos64_t *)); extern long int _IO_ftell __P((_IO_FILE*)); diff --git a/libio/iovswscanf.c b/libio/iovswscanf.c index dd7dbf8..1bbddd4 100644 --- a/libio/iovswscanf.c +++ b/libio/iovswscanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997-2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997-2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -47,3 +47,4 @@ vswscanf (string, format, args) ret = _IO_vfwscanf ((_IO_FILE *) &sf._sbf, format, args, NULL); return ret; } +libc_hidden_def (vswscanf) diff --git a/libio/putwc_u.c b/libio/putwc_u.c index 95db001..b76a313 100644 --- a/libio/putwc_u.c +++ b/libio/putwc_u.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,1995,1996,1997,1999,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -27,3 +27,4 @@ putwc_unlocked (wc, fp) CHECK_FILE (fp, WEOF); return _IO_putc_unlocked (wc, fp); } +libc_hidden_def (putwc_unlocked) -- cgit v1.1