diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-07-20 07:43:27 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-07-20 07:43:27 +0000 |
| commit | df6f89692fd7e802f38f944ed73942354a9911f8 (patch) | |
| tree | 12debd445b11886fcf433fc6f85e9abe615670cc /resolv/res_hconf.c | |
| parent | 10ffcd52f0578b13b48bdf84e73759353b29b673 (diff) | |
| download | glibc-df6f89692fd7e802f38f944ed73942354a9911f8.zip glibc-df6f89692fd7e802f38f944ed73942354a9911f8.tar.gz glibc-df6f89692fd7e802f38f944ed73942354a9911f8.tar.bz2 | |
* wcsmbs/bits/wchar2.h: Add definitions for wcrtomb, mbsrtowcs,
wcsrtombs, mbsnrtowcs, and wcsnrtombs.
* debug/Makefile (routines): Add wcrtomb_chk, mbsrtowcs_chk,
wcsrtombs_chk, mbsnrtowcs_chk, and wcsnrtombs_chk.
* debug/Versions: Add __wcrtomb_chk, __mbsrtowcs_chk,
__wcsrtombs_chk, __mbsnrtowcs_chk, and __wcsnrtombs_chk.
* debug/tst-chk1.c: Add tests for new functions.
* debug/mbsnrtowcs_chk.c: New file.
* debug/mbsrtowcs_chk.c: New file.
* debug/wcrtomb_chk.c: New file.
* debug/wcsnrtombs_chk.c: New file.
* debug/wcsrtombs_chk.c: New file.
* include/stdio.h: Add declaration for __fxprintf.
Diffstat (limited to 'resolv/res_hconf.c')
| -rw-r--r-- | resolv/res_hconf.c | 60 |
1 files changed, 10 insertions, 50 deletions
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index 91cd300..d3de4be 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@azstarnet.com). @@ -150,12 +150,7 @@ arg_service_list (const char *fname, int line_num, const char *args, fname, line_num, start) < 0) return 0; -#ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else -#endif - fputs (buf, stderr); + __fxprintf (NULL, "%s", L"%s", buf); free (buf); return 0; @@ -169,12 +164,7 @@ arg_service_list (const char *fname, int line_num, const char *args, fname, line_num, SERVICE_MAX) < 0) return 0; -#ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else -#endif - fputs (buf, stderr); + __fxprintf (NULL, "%s", L"%s", buf); free (buf); return 0; @@ -197,12 +187,7 @@ arg_service_list (const char *fname, int line_num, const char *args, fname, line_num) < 0) return 0; -#ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else -#endif - fputs (buf, stderr); + __fxprintf (NULL, "%s", L"%s", buf); free (buf); return 0; @@ -238,14 +223,9 @@ arg_trimdomain_list (const char *fname, int line_num, const char *args, fname, line_num, TRIMDOMAINS_MAX) < 0) return 0; -#ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else -#endif - fputs (buf, stderr); + __fxprintf (NULL, "%s", L"%s", buf); - free (buf); + free (buf); return 0; } _res_hconf.trimdomain[_res_hconf.num_trimdomains++] = @@ -264,12 +244,7 @@ arg_trimdomain_list (const char *fname, int line_num, const char *args, fname, line_num) < 0) return 0; -#ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else -#endif - fputs (buf, stderr); + __fxprintf (NULL, "%s", L"%s", buf); free (buf); return 0; @@ -327,12 +302,7 @@ arg_bool (const char *fname, int line_num, const char *args, unsigned flag) fname, line_num, args) < 0) return 0; -#ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else -#endif - fputs (buf, stderr); + __fxprintf (NULL, "%s", L"%s", buf); free (buf); return 0; @@ -375,12 +345,7 @@ parse_line (const char *fname, int line_num, const char *str) fname, line_num, start) < 0) return; -#ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else -#endif - fputs (buf, stderr); + __fxprintf (NULL, "%s", L"%s", buf); free (buf); return; @@ -405,12 +370,7 @@ parse_line (const char *fname, int line_num, const char *str) fname, line_num, str) < 0) break; -#ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else -#endif - fputs (buf, stderr); + __fxprintf (NULL, "%s", L"%s", buf); free (buf); } |