Update ICU to 54.1 step 1

source/tools/toolutil/ucbuf.c

 /*
 *******************************************************************************
 *
-*   Copyright (C) 1998-2011, International Business Machines
+*   Copyright (C) 1998-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *
 * File ucbuf.c
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   05/10/01    Ram         Creation.
@@ skipping 154 matching lines @@
     int32_t offset=0;
     const char* sourceLimit =NULL;
     int32_t cbufSize=0;
     pTarget = buf->buffer;
     /* check if we arrived here without exhausting the buffer*/
     if(buf->currentPos<buf->bufLimit){
         offset = (int32_t)(buf->bufLimit-buf->currentPos);
         memmove(buf->buffer,buf->currentPos,offset* sizeof(UChar));
     }
 
-#if DEBUG
+#if UCBUF_DEBUG
     memset(pTarget+offset,0xff,sizeof(UChar)*(MAX_IN_BUF-offset));
 #endif
     if(buf->isBuffered){
         cbufSize = MAX_IN_BUF;
         /* read the file */
         inputRead=T_FileStream_read(buf->in,cbuf,cbufSize-offset);
         buf->remaining-=inputRead;
         
     }else{
         cbufSize = T_FileStream_size(buf->in);
@@ skipping 96 matching lines @@
             source = cbuf;
 
             /* re convert */
             ucnv_toUnicode(buf->conv,&target,target+(buf->bufCapacity-offset),
                             &source,sourceLimit,NULL,
                             (UBool)(buf->remaining==0),&error1);
 
         }
         outputWritten = (int32_t)(target - pTarget);
 
-
-#if DEBUG
+#if UCBUF_DEBUG
         {
             int i;
             target = pTarget;
             for(i=0;i<numRead;i++){
               /*  printf("%c", (char)(*target++));*/
             }
         }
 #endif
 
     }else{
@@ skipping 424 matching lines @@
                 ucbuf_fillucbuf(buf,err);
                 if(U_FAILURE(*err)){
                     return NULL; 
                 }
             }
             /*
              * Accoding to TR 13 readLine functions must interpret
              * CR, CR+LF, LF, NEL, PS, LS or FF as line seperators
              */
             /* Windows CR LF */
-            if(c ==0x0d && temp+1<=buf->bufLimit && *(temp+1) == 0x0a ){
+            if(c ==0x0d && temp <= buf->bufLimit && *temp == 0x0a ){
                 *len = (int32_t)(temp++ - buf->currentPos);
                 savePos = buf->currentPos;
                 buf->currentPos = temp;
                 return savePos;
             }
             /* else */
 
             if (temp>=buf->bufLimit|| ucbuf_isCharNewLine(c)){  /* Unipad inserts 2028 line separators! */
                 *len = (int32_t)(temp - buf->currentPos);
                 savePos = buf->currentPos;
                 buf->currentPos = temp;
                 return savePos;
             }
         }
     }else{
     /* we know that all input is read into the internal
     * buffer so we can safely return pointers
         */
         for(;;){
             c = *temp++;
             
             if(buf->currentPos==buf->bufLimit){
                 return NULL; /* end of file is reached return NULL */
             }
             /* Windows CR LF */
-            if(c ==0x0d && temp+1<=buf->bufLimit && *(temp+1) == 0x0a ){
+            if(c ==0x0d && temp <= buf->bufLimit && *temp == 0x0a ){
                 *len = (int32_t)(temp++ - buf->currentPos);
                 savePos = buf->currentPos;
                 buf->currentPos = temp;
                 return savePos;
             }
             /* else */
             if (temp>=buf->bufLimit|| ucbuf_isCharNewLine(c)) {  /* Unipad inserts 2028 line separators! */
                 *len = (int32_t)(temp - buf->currentPos);
                 savePos = buf->currentPos;
                 buf->currentPos = temp;
                 return savePos;
             }
         }
     }
     /* not reached */
     /* A compiler warning will appear if all paths don't contain a return statement. */
 /*    return NULL;*/
 }
 #endif