diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-03-11 20:14:03 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-03-11 20:14:03 +0000 |
| commit | ca668b298e9b8c2c191eae259fddfed5e03a8dd4 (patch) | |
| tree | 5d8564216d37dee32c78da7b8ed6b9301e0cea86 /iconv/iconv_prog.h | |
| parent | 5484ff515e97e1be0ce77ca171b1476558e2521f (diff) | |
[BZ #5903]cvs/fedora-glibc-20080314T1732
2008-03-11 Ulrich Drepper <drepper@redhat.com>
[BZ #5903]
* iconv/iconv_charmap.c (charmap_conversion): Pass name of output file
not stream for output file. Open output file here.
* iconv/iconv_prog.c (process_lock): Take pointer to output stream
and output file name.
(process_fd): Likewise.
(process_file): Likewise.
(main): Adjust callers of changed functions.
* iconv/iconv_prog.h: Adjust prototype.
Diffstat (limited to 'iconv/iconv_prog.h')
| -rw-r--r-- | iconv/iconv_prog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/iconv_prog.h b/iconv/iconv_prog.h index 17d67dddc5..b05de32df1 100644 --- a/iconv/iconv_prog.h +++ b/iconv/iconv_prog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. @@ -36,7 +36,7 @@ extern int charmap_conversion (const char *from_code, const char *to_code, struct charmap_t *to_charmap, int argc, int remaining, char *argv[], - FILE *output); + const char *output_file); #endif /* iconv_prog.h */ |