ICU-491.11.1.tar.gz

[apple/icu.git] / icuSources / io / ustdio.c

diff --git a/icuSources/io/ustdio.c b/icuSources/io/ustdio.c
index 0ec153ad249614cad2a287aa68af9731877c14b8..df4c4f1c37c4441f49d09e8f81eac7843c35db24 100644 (file)
--- a/icuSources/io/ustdio.c
+++ b/icuSources/io/ustdio.c
@@ -1,7 +1,7 @@
 /*
  ******************************************************************************
  *
 /*
  ******************************************************************************
  *

- *   Copyright (C) 1998-2010, International Business Machines
+ *   Copyright (C) 1998-2011, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  *
  ******************************************************************************
  *   Corporation and others.  All Rights Reserved.
  *
  ******************************************************************************


@@ -37,7 +37,7 @@
 #define DELIM_PS 0x2029
 
 /* TODO: is this correct for all codepages? Should we just use \n and let the converter handle it? */
 #define DELIM_PS 0x2029
 
 /* TODO: is this correct for all codepages? Should we just use \n and let the converter handle it? */

-#ifdef U_WINDOWS
+#if U_PLATFORM_USES_ONLY_WIN32_API

 static const UChar DELIMITERS [] = { DELIM_CR, DELIM_LF, 0x0000 };
 static const uint32_t DELIMITERS_LEN = 2;
 /* TODO: Default newline writing should be detected based upon the converter being used. */
 static const UChar DELIMITERS [] = { DELIM_CR, DELIM_LF, 0x0000 };
 static const uint32_t DELIMITERS_LEN = 2;
 /* TODO: Default newline writing should be detected based upon the converter being used. */


@@ -425,7 +425,7 @@ ufile_fill_uchar_buffer(UFILE *f)
 
     /* shift the buffer if it isn't empty */
     if(dataSize != 0) {
 
     /* shift the buffer if it isn't empty */
     if(dataSize != 0) {

-        uprv_memmove(f->fUCBuffer, str->fPos, dataSize * sizeof(UChar));
+        uprv_memmove(f->fUCBuffer, str->fPos, dataSize * sizeof(UChar)); /* not accessing beyond memory */

     }
 
 
     }