comparison src/fileio.c @ 1836:03714c67a82b v7.2.134

updated for version 7.2-134
author vimboss
date Wed, 11 Mar 2009 12:11:02 +0000
parents ccbd8177e1f4
children cfcc1421f5e4
comparison
equal deleted inserted replaced
1835:8389197c91f3 1836:03714c67a82b
5286 size_t tolen; 5286 size_t tolen;
5287 5287
5288 /* Convert with iconv(). */ 5288 /* Convert with iconv(). */
5289 if (ip->bw_restlen > 0) 5289 if (ip->bw_restlen > 0)
5290 { 5290 {
5291 char *fp;
5292
5291 /* Need to concatenate the remainder of the previous call and 5293 /* Need to concatenate the remainder of the previous call and
5292 * the bytes of the current call. Use the end of the 5294 * the bytes of the current call. Use the end of the
5293 * conversion buffer for this. */ 5295 * conversion buffer for this. */
5294 fromlen = len + ip->bw_restlen; 5296 fromlen = len + ip->bw_restlen;
5295 from = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen; 5297 fp = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen;
5296 mch_memmove((void *)from, ip->bw_rest, (size_t)ip->bw_restlen); 5298 mch_memmove(fp, ip->bw_rest, (size_t)ip->bw_restlen);
5297 mch_memmove((void *)(from + ip->bw_restlen), buf, (size_t)len); 5299 mch_memmove(fp + ip->bw_restlen, buf, (size_t)len);
5300 from = fp;
5298 tolen = ip->bw_conv_buflen - fromlen; 5301 tolen = ip->bw_conv_buflen - fromlen;
5299 } 5302 }
5300 else 5303 else
5301 { 5304 {
5302 from = (const char *)buf; 5305 from = (const char *)buf;