vim: src/fileio.c comparison

comparison src/fileio.c @ 835:8bebcabccc2c v7.0e01

updated for version 7.0e01

author	vimboss
date	Mon, 17 Apr 2006 22:14:47 +0000
parents	5117153003bd
children	5a7843c57316

comparison

equal deleted inserted replaced

-:5117153003bd
+:8bebcabccc2c
 		 * become up to 4 bytes, size must be multiple of 2
 		 * ucs-2 to utf-8: 2 bytes become up to 3 bytes, size must be
 		 * multiple of 2
 		 * ucs-4 to utf-8: 4 bytes become up to 6 bytes, size must be
 		 * multiple of 4 */
-		real_size = size;
+		real_size = (int)size;
 # ifdef USE_ICONV
 		if (iconv_fd != (iconv_t)-1)
 		    size = size / ICONV_MULT;
 		else
 # endif
 			    if ((int)tlen + n + 1 > size)
 			    {
 				/* Filled up to "size", append partial line.
 				 * Change NL to NUL to reverse the effect done
 				 * below. */
-				n = size - tlen;
+				n = (int)(size - tlen);
 				for (ni = 0; ni < n; ++ni)
 				{
 				    if (p[ni] == NL)
 					ptr[tlen++] = NUL;
 				    else
 		    if (codepage == CP_UTF8)
 		    {
 			/* Handle CP_UTF8 input ourselves to be able to handle
 			 * trailing bytes properly.
 			 * Get one UTF-8 character from src. */
-			bytelen = utf_ptr2len_len(src, size);
+			bytelen = (int)utf_ptr2len_len(src, size);
 			if (bytelen > size)
 			{
 			    /* Only got some bytes of a character.  Normally
 			     * it's put in "conv_rest", but if it's too long
 			     * deal with it as if they were illegal bytes. */
 			    /* From UCS-2 to "enc_codepage".  If the
 			     * conversion uses the default character "?",
 			     * the data doesn't fit in this encoding. */
 			    dstlen = WideCharToMultiByte(enc_codepage, 0,
 				    (LPCWSTR)ucs2buf, ucs2len,
-				    (LPSTR)dst, (src - dst),
+				    (LPSTR)dst, (int)(src - dst),
 				    replstr, &bad);
 			    if (bad)
 				found_bad = TRUE;
 			    else
 				dst += dstlen;
 		    mch_memmove(conv_rest, src, size);
 		    conv_restlen = size;
 		}
 		/* The new size is equal to how much "dst" was advanced. */
-		size = dst - ptr;
+		size = (long)(dst - ptr);
 	    }
 	    else
 # endif
 # ifdef MACOS_CONVERT
 	    if (fio_flags & FIO_MACROMAN)
 		/* Reading UTF-8: Check if the bytes are valid UTF-8.
 		 * Need to start before "ptr" when part of the character was
 		 * read in the previous read() call. */
 		for (p = ptr - utf_head_off(buffer, ptr); ; ++p)
 		{
-		    int	 todo = (ptr + size) - p;
+		    int	 todo = (int)((ptr + size) - p);
 		    int	 l;
 		    if (todo <= 0)
 			break;
 		    if (*p >= 0x80)
 mch_free_acl(acl);
 #endif
 if (errmsg != NULL)
 {
-	int numlen = errnum != NULL ? STRLEN(errnum) : 0;
+	int numlen = errnum != NULL ? (int)STRLEN(errnum) : 0;
 	attr = hl_attr(HLF_E);	/* set highlight for error messages */
 	msg_add_fname(buf,
 #ifndef UNIX
 		sfname
 	    {
 		/* Convert from UTF-8 to UCS-2, to the start of the buffer.
 		 * The buffer has been allocated to be big enough. */
 		while (fromlen > 0)
 		{
-		    n = utf_ptr2len_len(from, fromlen);
+		    n = (int)utf_ptr2len_len(from, (int)fromlen);
 		    if (n > (int)fromlen)	/* incomplete byte sequence */
 			break;
 		    u8c = utf_ptr2char(from);
 		    *to++ = (u8c & 0xff);
 		    *to++ = (u8c >> 8);
 		    /* weird overlong sequence */
 		    ip->bw_conv_error = TRUE;
 		    return FAIL;
 		}
 		mch_memmove(ip->bw_rest, from, fromlen);
-		ip->bw_restlen = fromlen;
+		ip->bw_restlen = (int)fromlen;
 	    }
 	    else
 	    {
 		/* Convert from enc_codepage to UCS-2, to the start of the
 		 * buffer.  The buffer has been allocated to be big enough. */
 		ip->bw_restlen = 0;
 		needed = MultiByteToWideChar(enc_codepage,
-				  MB_ERR_INVALID_CHARS, (LPCSTR)from, fromlen,
+				  MB_ERR_INVALID_CHARS, (LPCSTR)from, (int)fromlen,
 								     NULL, 0);
 		if (needed == 0)
 		{
 		    /* When conversion fails there may be a trailing byte. */
 		    needed = MultiByteToWideChar(enc_codepage,
-			      MB_ERR_INVALID_CHARS, (LPCSTR)from, fromlen - 1,
+			      MB_ERR_INVALID_CHARS, (LPCSTR)from, (int)fromlen - 1,
 								     NULL, 0);
 		    if (needed == 0)
 		    {
 			/* Conversion doesn't work. */
 			ip->bw_conv_error = TRUE;
 		    /* Save the trailing byte for the next call. */
 		    ip->bw_rest[0] = from[fromlen - 1];
 		    ip->bw_restlen = 1;
 		}
 		needed = MultiByteToWideChar(enc_codepage, MB_ERR_INVALID_CHARS,
-				       (LPCSTR)from, fromlen - ip->bw_restlen,
+				       (LPCSTR)from, (int)(fromlen - ip->bw_restlen),
 							  (LPWSTR)to, needed);
 		if (needed == 0)
 		{
 		    /* Safety check: Conversion doesn't work. */
 		    ip->bw_conv_error = TRUE;
 		    {
 			ip->bw_conv_error = TRUE;
 			return FAIL;
 		    }
 		}
-		len = to - buf;
+		len = (int)(to - buf);
 	    }
 	    else
 #endif
 	    {
 		/* Convert from UCS-2 to the codepage, using the remainder of
 		 * the conversion buffer.  If the conversion uses the default
 		 * character "0", the data doesn't fit in this encoding, so
 		 * fail. */
 		len = WideCharToMultiByte(FIO_GET_CP(flags), 0,
 			(LPCWSTR)ip->bw_conv_buf, (int)fromlen / sizeof(WCHAR),
-			(LPSTR)to, ip->bw_conv_buflen - fromlen, 0, &bad);
+			(LPSTR)to, (int)(ip->bw_conv_buflen - fromlen), 0, &bad);
 		if (bad)
 		{
 		    ip->bw_conv_error = TRUE;
 		    return FAIL;
 		}
 	if (is_buflocal)
 	{
 	    /* normalize pat into standard "<buffer>#N" form */
 	    sprintf((char *)buflocal_pat, "<buffer=%d>", buflocal_nr);
 	    pat = buflocal_pat;			/* can modify pat and patlen */
-	    patlen = STRLEN(buflocal_pat);	/*   but not endpat */
+	    patlen = (int)STRLEN(buflocal_pat);	/*   but not endpat */
 	}
 	/*
 	 * Find AutoPat entries with this pattern.
 	 */

Mercurial > vim

comparison src/fileio.c @ 835:8bebcabccc2c v7.0e01