From 9f140581e08b255697a4d824ac57559a04c416e0 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 6 Feb 2011 20:37:35 +0100 Subject: misc updates Signed-off-by: Florian Pritz --- vim/vim-7.2/7.2.050 | 316 ---------------------------------------------------- 1 file changed, 316 deletions(-) delete mode 100644 vim/vim-7.2/7.2.050 (limited to 'vim/vim-7.2/7.2.050') diff --git a/vim/vim-7.2/7.2.050 b/vim/vim-7.2/7.2.050 deleted file mode 100644 index 416d32b..0000000 --- a/vim/vim-7.2/7.2.050 +++ /dev/null @@ -1,316 +0,0 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.050 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.2.050 -Problem: Warnings for not checking return value of fwrite(). (Chip Campbell) -Solution: Use the return value. -Files: src/spell.c - - -*** ../vim-7.2.049/src/spell.c Mon Aug 25 04:12:38 2008 ---- src/spell.c Thu Nov 20 17:28:01 2008 -*************** -*** 7926,7931 **** ---- 7926,7933 ---- - char_u *p; - int rr; - int retval = OK; -+ int fwv = 1; /* collect return value of fwrite() to avoid -+ warnings from picky compiler */ - - fd = mch_fopen((char *)fname, "w"); - if (fd == NULL) -*************** -*** 7936,7946 **** - - /*
: */ - /* */ -! if (fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd) != 1) -! { -! EMSG(_(e_write)); -! retval = FAIL; -! } - putc(VIMSPELLVERSION, fd); /* */ - - /* ---- 7938,7944 ---- - - /*
: */ - /* */ -! fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd); - putc(VIMSPELLVERSION, fd); /* */ - - /* -*************** -*** 7955,7961 **** - - i = (int)STRLEN(spin->si_info); - put_bytes(fd, (long_u)i, 4); /* */ -! fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* */ - } - - /* SN_REGION: ... ---- 7953,7959 ---- - - i = (int)STRLEN(spin->si_info); - put_bytes(fd, (long_u)i, 4); /* */ -! fwv &= fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* */ - } - - /* SN_REGION: ... -*************** -*** 7966,7972 **** - putc(SNF_REQUIRED, fd); /* */ - l = spin->si_region_count * 2; - put_bytes(fd, (long_u)l, 4); /* */ -! fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd); - /* ... */ - regionmask = (1 << spin->si_region_count) - 1; - } ---- 7964,7970 ---- - putc(SNF_REQUIRED, fd); /* */ - l = spin->si_region_count * 2; - put_bytes(fd, (long_u)l, 4); /* */ -! fwv &= fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd); - /* ... */ - regionmask = (1 << spin->si_region_count) - 1; - } -*************** -*** 8016,8022 **** - } - - put_bytes(fd, (long_u)l, 2); /* */ -! fwrite(folchars, (size_t)l, (size_t)1, fd); /* */ - } - - /* SN_MIDWORD: */ ---- 8014,8020 ---- - } - - put_bytes(fd, (long_u)l, 2); /* */ -! fwv &= fwrite(folchars, (size_t)l, (size_t)1, fd); /* */ - } - - /* SN_MIDWORD: */ -*************** -*** 8027,8033 **** - - i = (int)STRLEN(spin->si_midword); - put_bytes(fd, (long_u)i, 4); /* */ -! fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); /* */ - } - - /* SN_PREFCOND: ... */ ---- 8025,8032 ---- - - i = (int)STRLEN(spin->si_midword); - put_bytes(fd, (long_u)i, 4); /* */ -! fwv &= fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); -! /* */ - } - - /* SN_PREFCOND: ... */ -*************** -*** 8113,8119 **** - p = rr == 1 ? ftp->ft_from : ftp->ft_to; - l = (int)STRLEN(p); - putc(l, fd); -! fwrite(p, l, (size_t)1, fd); - } - } - ---- 8112,8118 ---- - p = rr == 1 ? ftp->ft_from : ftp->ft_to; - l = (int)STRLEN(p); - putc(l, fd); -! fwv &= fwrite(p, l, (size_t)1, fd); - } - } - -*************** -*** 8131,8141 **** - /* */ - - put_bytes(fd, (long_u)l, 2); /* */ -! fwrite(spin->si_sofofr, l, (size_t)1, fd); /* */ - - l = (int)STRLEN(spin->si_sofoto); - put_bytes(fd, (long_u)l, 2); /* */ -! fwrite(spin->si_sofoto, l, (size_t)1, fd); /* */ - } - - /* SN_WORDS: ... ---- 8130,8140 ---- - /* */ - - put_bytes(fd, (long_u)l, 2); /* */ -! fwv &= fwrite(spin->si_sofofr, l, (size_t)1, fd); /* */ - - l = (int)STRLEN(spin->si_sofoto); - put_bytes(fd, (long_u)l, 2); /* */ -! fwv &= fwrite(spin->si_sofoto, l, (size_t)1, fd); /* */ - } - - /* SN_WORDS: ... -*************** -*** 8160,8166 **** - l = (int)STRLEN(hi->hi_key) + 1; - len += l; - if (round == 2) /* */ -! fwrite(hi->hi_key, (size_t)l, (size_t)1, fd); - --todo; - } - if (round == 1) ---- 8159,8165 ---- - l = (int)STRLEN(hi->hi_key) + 1; - len += l; - if (round == 2) /* */ -! fwv &= fwrite(hi->hi_key, (size_t)l, (size_t)1, fd); - --todo; - } - if (round == 1) -*************** -*** 8176,8182 **** - putc(0, fd); /* */ - l = spin->si_map.ga_len; - put_bytes(fd, (long_u)l, 4); /* */ -! fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd); - /* */ - } - ---- 8175,8181 ---- - putc(0, fd); /* */ - l = spin->si_map.ga_len; - put_bytes(fd, (long_u)l, 4); /* */ -! fwv &= fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd); - /* */ - } - -*************** -*** 8232,8241 **** - { - p = ((char_u **)(spin->si_comppat.ga_data))[i]; - putc((int)STRLEN(p), fd); /* */ -! fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);/* */ - } - /* */ -! fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags), - (size_t)1, fd); - } - ---- 8231,8241 ---- - { - p = ((char_u **)(spin->si_comppat.ga_data))[i]; - putc((int)STRLEN(p), fd); /* */ -! fwv &= fwrite(p, (size_t)STRLEN(p), (size_t)1, fd); -! /* */ - } - /* */ -! fwv &= fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags), - (size_t)1, fd); - } - -*************** -*** 8259,8265 **** - - l = (int)STRLEN(spin->si_syllable); - put_bytes(fd, (long_u)l, 4); /* */ -! fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); /* */ - } - - /* end of */ ---- 8259,8266 ---- - - l = (int)STRLEN(spin->si_syllable); - put_bytes(fd, (long_u)l, 4); /* */ -! fwv &= fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); -! /* */ - } - - /* end of */ -*************** -*** 8295,8307 **** - (void)put_node(fd, tree, 0, regionmask, round == 3); - } - -! /* Write another byte to check for errors. */ - if (putc(0, fd) == EOF) - retval = FAIL; - - if (fclose(fd) == EOF) - retval = FAIL; - - return retval; - } - ---- 8296,8313 ---- - (void)put_node(fd, tree, 0, regionmask, round == 3); - } - -! /* Write another byte to check for errors (file system full). */ - if (putc(0, fd) == EOF) - retval = FAIL; - - if (fclose(fd) == EOF) - retval = FAIL; - -+ if (fwv != 1) -+ retval = FAIL; -+ if (retval == FAIL) -+ EMSG(_(e_write)); -+ - return retval; - } - -*************** -*** 9890,9895 **** ---- 9896,9902 ---- - char_u *p; - int len; - int totlen; -+ int x = 1; /* collect return value of fwrite() */ - - if (fd != NULL) - put_bytes(fd, (long_u)gap->ga_len, 2); /* */ -*************** -*** 9906,9912 **** - if (fd != NULL) - { - fputc(len, fd); -! fwrite(p, (size_t)len, (size_t)1, fd); - } - totlen += len; - } ---- 9913,9919 ---- - if (fd != NULL) - { - fputc(len, fd); -! x &= fwrite(p, (size_t)len, (size_t)1, fd); - } - totlen += len; - } -*** ../vim-7.2.049/src/version.c Thu Nov 20 17:09:09 2008 ---- src/version.c Fri Nov 28 10:06:13 2008 -*************** -*** 678,679 **** ---- 678,681 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 50, - /**/ - --- -You got to work at a mill? Lucky! I got sent back to work in the -acid-mines for my daily crust of stale bread... which not even the -birds would eat. - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- cgit v1.2.3-24-g4f1b