projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 478508cd ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.134 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.134 | |
| 11 | Problem: Warning for discarding "const" from pointer. | |
| 12 | Solution: Don't pass const pointer to mch_memmove(). | |
| 13 | Files: src/fileio.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.133/src/fileio.c Thu Mar 5 03:13:51 2009 | |
| 17 | --- src/fileio.c Wed Mar 11 12:59:35 2009 | |
| 18 | *************** | |
| 19 | *** 5288,5300 **** | |
| 20 | /* Convert with iconv(). */ | |
| 21 | if (ip->bw_restlen > 0) | |
| 22 | { | |
| 23 | /* Need to concatenate the remainder of the previous call and | |
| 24 | * the bytes of the current call. Use the end of the | |
| 25 | * conversion buffer for this. */ | |
| 26 | fromlen = len + ip->bw_restlen; | |
| 27 | ! from = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen; | |
| 28 | ! mch_memmove((void *)from, ip->bw_rest, (size_t)ip->bw_restlen); | |
| 29 | ! mch_memmove((void *)(from + ip->bw_restlen), buf, (size_t)len); | |
| 30 | tolen = ip->bw_conv_buflen - fromlen; | |
| 31 | } | |
| 32 | else | |
| 33 | --- 5288,5303 ---- | |
| 34 | /* Convert with iconv(). */ | |
| 35 | if (ip->bw_restlen > 0) | |
| 36 | { | |
| 37 | + char *fp; | |
| 38 | + | |
| 39 | /* Need to concatenate the remainder of the previous call and | |
| 40 | * the bytes of the current call. Use the end of the | |
| 41 | * conversion buffer for this. */ | |
| 42 | fromlen = len + ip->bw_restlen; | |
| 43 | ! fp = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen; | |
| 44 | ! mch_memmove(fp, ip->bw_rest, (size_t)ip->bw_restlen); | |
| 45 | ! mch_memmove(fp + ip->bw_restlen, buf, (size_t)len); | |
| 46 | ! from = fp; | |
| 47 | tolen = ip->bw_conv_buflen - fromlen; | |
| 48 | } | |
| 49 | else | |
| 50 | *** ../vim-7.2.133/src/version.c Wed Mar 11 12:45:44 2009 | |
| 51 | --- src/version.c Wed Mar 11 13:08:25 2009 | |
| 52 | *************** | |
| 53 | *** 678,679 **** | |
| 54 | --- 678,681 ---- | |
| 55 | { /* Add new patch number below this line */ | |
| 56 | + /**/ | |
| 57 | + 134, | |
| 58 | /**/ | |
| 59 | ||
| 60 | -- | |
| 61 | hundred-and-one symptoms of being an internet addict: | |
| 62 | 193. You ask your girlfriend to drive home so you can sit back with | |
| 63 | your PDA and download the information to your laptop | |
| 64 | ||
| 65 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 66 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 67 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 68 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |