Sync with fileutils

diff --git a/lib/unicodeio.h b/lib/unicodeio.h
index 4a22bfbb88c253ea524de760b17d7e10b551d427..fb2b75242539ad67e24ddc0aaa37e4e8c1a7e663 100644 (file)
--- a/lib/unicodeio.h
+++ b/lib/unicodeio.h
@@ -1,20 +1,21 @@
 /* Unicode character output to streams with locale dependent encoding.
 
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef UNICODEIO_H
 # define UNICODEIO_H
@@ -29,29 +30,15 @@
 #  endif
 # endif
 
-/* Converts the Unicode character CODE to its multibyte representation
-   in the current locale and calls the CALLBACK on the resulting byte
-   sequence.  If an error occurs, invokes ERROR_CALLBACK instead,
-   passing it CODE with errno set appropriately.  Returns whatever the
-   callback returns.  */
-extern int unicode_to_mb
-           PARAMS ((unsigned int code,
-                    int (*callback) PARAMS ((const char *buf, size_t buflen,
-                                             void *callback_arg)),
-                    int (*error_callback) PARAMS ((unsigned int code,
-                                                   void * callback_arg)),
-                    void *callback_arg));
-
-/* Success callback that outputs the conversion of the character.  */
-extern int print_unicode_success PARAMS((const char *buf, size_t buflen,
-                                        void *callback_arg));
-
-/* Failure callback that outputs an ASCII representation.  */
-extern int print_unicode_failure PARAMS((unsigned int code,
-                                        void *callback_arg));
-
 /* Outputs the Unicode character CODE to the output stream STREAM.
-   Returns -1 (setting errno) if unsuccessful.  */
-extern int print_unicode_char PARAMS((FILE *stream, unsigned int code));
+   Upon failure, exit if exit_on_error is true, otherwise output a fallback
+   notation.  */
+extern void print_unicode_char PARAMS ((FILE *stream, unsigned int code,
+                                       int exit_on_error));
+
+/* Simple success callback that outputs the converted string.
+   The STREAM is passed as callback_arg.  */
+extern long fwrite_success_callback PARAMS ((const char *buf, size_t buflen,
+                                            void *callback_arg));
 
 #endif