Update ICU to 54.1 step 1

source/io/unicode/ustdio.h

 /*
 ******************************************************************************
 *
-*   Copyright (C) 1998-2013, International Business Machines
+*   Copyright (C) 1998-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 * File ustdio.h
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   10/16/98    stephen     Creation.
 *   11/06/98    stephen     Modified per code review.
 *   03/12/99    stephen     Modified for new C API.
 *   07/19/99    stephen     Minor doc update.
 *   02/01/01    george      Added sprintf & sscanf with all of its variants
 ******************************************************************************
 */
 
 #ifndef USTDIO_H
 #define USTDIO_H
 
 #include <stdio.h>
 #include <stdarg.h>
 
 #include "unicode/utypes.h"
 #include "unicode/ucnv.h"
 #include "unicode/utrans.h"
 #include "unicode/localpointer.h"
 #include "unicode/unum.h"
 
+#if !UCONFIG_NO_CONVERSION
+
 /*
     TODO
  The following is a small list as to what is currently wrong/suggestions for
  ustdio.
 
  * Make sure that * in the scanf format specification works for all formats.
  * Each UFILE takes up at least 2KB.
     Look into adding setvbuf() for configurable buffers.
  * This library does buffering. The OS should do this for us already. Check on
     this, and remove it from this library, if this is the case. Double buffering
@@ skipping 190 matching lines @@
  * will be used.
  * @return A new UFILE, or NULL if an error occurred.
  * @stable ICU 3.0
  */
 U_STABLE UFILE* U_EXPORT2
 u_fopen(const char    *filename,
     const char    *perm,
     const char    *locale,
     const char    *codepage);
 
+#ifndef U_HIDE_DRAFT_API
+/**
+ * Open a UFILE with a UChar* filename
+ * A UFILE is a wrapper around a FILE* that is locale and codepage aware.
+ * That is, data written to a UFILE will be formatted using the conventions
+ * specified by that UFILE's Locale; this data will be in the character set
+ * specified by that UFILE's codepage.
+ * @param filename The name of the file to open.
+ * @param perm The read/write permission for the UFILE; one of "r", "w", "rw"
+ * @param locale The locale whose conventions will be used to format
+ * and parse output. If this parameter is NULL, the default locale will
+ * be used.
+ * @param codepage The codepage in which data will be written to and
+ * read from the file. If this paramter is NULL the system default codepage
+ * will be used.
+ * @return A new UFILE, or NULL if an error occurred.
+ * @draft ICU 54
+ */
+U_DRAFT UFILE* U_EXPORT2
+u_fopen_u(const UChar    *filename,
+    const char    *perm,
+    const char    *locale,
+    const char    *codepage);
+#endif  /* U_HIDE_DRAFT_API */
+
 /**
  * Open a UFILE on top of an existing FILE* stream. The FILE* stream
  * ownership remains with the caller. To have the UFILE take over
  * ownership and responsibility for the FILE* stream, use the
  * function u_fadopt.
  * @param f The FILE* to which this UFILE will attach and use.
  * @param locale The locale whose conventions will be used to format 
  * and parse output. If this parameter is NULL, the default locale will 
  * be used.
  * @param codepage The codepage in which data will be written to and
@@ skipping 178 matching lines @@
 
 /**
  * Returns an alias to the converter being used for this file.
  * @param f The UFILE to get the value from
  * @return alias to the converter (The converter <EM>must not</EM> be modified or closed)
  * @stable ICU 3.0
  */
 U_STABLE UConverter* U_EXPORT2 u_fgetConverter(UFILE *f);
 
 #if !UCONFIG_NO_FORMATTING
-#ifndef U_HIDE_DRAFT_API
 /**
  * Returns an alias to the number formatter being used for this file.
  * @param f The UFILE to get the value from
  * @return alias to the number formatter (The formatter <EM>must not</EM> be modified or closed)
- * @draft ICU 51
+ * @stable ICU 51
 */
- U_DRAFT const UNumberFormat* U_EXPORT2 u_fgetNumberFormat(UFILE *f);
-#endif /* U_HIDE_DRAFT_API */
+ U_STABLE const UNumberFormat* U_EXPORT2 u_fgetNumberFormat(UFILE *f);
 
 /* Output functions */
 
 /**
  * Write formatted data to <TT>stdout</TT>.
  * @param patternSpecification A pattern specifying how <TT>u_printf</TT> will
  * interpret the variable arguments received and format the data.
  * @return The number of Unicode characters written to <TT>stdout</TT>
  * @stable ICU 49
  */
@@ skipping 517 matching lines @@
  * @return The number of items successfully converted and assigned, or EOF
  * if an error occurred.
  * @see u_sscanf_u
  * @stable ICU 3.0
  */
 U_STABLE int32_t U_EXPORT2
 u_vsscanf_u(const UChar *buffer,
         const UChar     *patternSpecification,
         va_list         ap);
 
+
+#endif
 #endif
 #endif