To: vim_dev@googlegroups.com Subject: Patch 8.2.1299 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1299 Problem: Compiler warning for using size_t for int and void pointer. Solution: Add type casts. Files: src/scriptfile.c *** ../vim-8.2.1298/src/scriptfile.c 2020-07-26 15:51:02.911908505 +0200 --- src/scriptfile.c 2020-07-26 15:54:32.191050845 +0200 *************** *** 157,174 **** last_type = entry->es_type; } len += STRLEN(type_name); ! if (ga_grow(&ga, len) == FAIL) break; if (idx == exestack.ga_len - 1 || entry->es_lnum == 0) // For the bottom entry: do not add the line number, it is used // in . Also leave it out when the number is not set. ! vim_snprintf(ga.ga_data + ga.ga_len, len, "%s%s%s", type_name, entry->es_name, idx == exestack.ga_len - 1 ? "" : ".."); else ! vim_snprintf(ga.ga_data + ga.ga_len, len, "%s%s[%ld]..", type_name, entry->es_name, entry->es_lnum); ! ga.ga_len += STRLEN(ga.ga_data + ga.ga_len); } } --- 157,174 ---- last_type = entry->es_type; } len += STRLEN(type_name); ! if (ga_grow(&ga, (int)len) == FAIL) break; if (idx == exestack.ga_len - 1 || entry->es_lnum == 0) // For the bottom entry: do not add the line number, it is used // in . Also leave it out when the number is not set. ! vim_snprintf((char *)ga.ga_data + ga.ga_len, len, "%s%s%s", type_name, entry->es_name, idx == exestack.ga_len - 1 ? "" : ".."); else ! vim_snprintf((char *)ga.ga_data + ga.ga_len, len, "%s%s[%ld]..", type_name, entry->es_name, entry->es_lnum); ! ga.ga_len += (int)STRLEN((char *)ga.ga_data + ga.ga_len); } } *** ../vim-8.2.1298/src/version.c 2020-07-26 15:51:02.911908505 +0200 --- src/version.c 2020-07-26 15:55:09.478895844 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1299, /**/ -- From "know your smileys": !-| I-am-a-Cylon-Centurian-with-one-red-eye-bouncing-back-and-forth /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///