To: vim_dev@googlegroups.com Subject: Patch 8.2.1148 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1148 Problem: Warning for using int instead of size_t. Solution: Change "len" argument to size_t. (Mike Williams) Files: src/vim9compile.c, src/proto/vim9compile.pro, src/vim9script.c *** ../vim-8.2.1147/src/vim9compile.c 2020-07-05 21:38:07.857431843 +0200 --- src/vim9compile.c 2020-07-06 21:34:06.284425205 +0200 *************** *** 288,294 **** * Return FAIL and give an error if it defined. */ int ! check_defined(char_u *p, int len, cctx_T *cctx) { if (lookup_script(p, len) == OK || (cctx != NULL --- 288,294 ---- * Return FAIL and give an error if it defined. */ int ! check_defined(char_u *p, size_t len, cctx_T *cctx) { if (lookup_script(p, len) == OK || (cctx != NULL *** ../vim-8.2.1147/src/proto/vim9compile.pro 2020-06-21 15:52:55.810451610 +0200 --- src/proto/vim9compile.pro 2020-07-06 21:35:34.600189542 +0200 *************** *** 1,5 **** /* vim9compile.c */ ! int check_defined(char_u *p, int len, cctx_T *cctx); type_T *typval2type(typval_T *tv); int check_type(type_T *expected, type_T *actual, int give_msg); char_u *skip_type(char_u *start); --- 1,5 ---- /* vim9compile.c */ ! int check_defined(char_u *p, size_t len, cctx_T *cctx); type_T *typval2type(typval_T *tv); int check_type(type_T *expected, type_T *actual, int give_msg); char_u *skip_type(char_u *start); *** ../vim-8.2.1147/src/vim9script.c 2020-07-04 14:14:55.633073475 +0200 --- src/vim9script.c 2020-07-06 21:35:10.460253958 +0200 *************** *** 324,330 **** if (eval_isnamec1(*arg)) while (eval_isnamec(*arg)) ++arg; ! if (check_defined(p, (int)(arg - p), cctx) == FAIL) goto erret; as_name = vim_strnsave(p, arg - p); arg = skipwhite_and_linebreak(arg, evalarg); --- 324,330 ---- if (eval_isnamec1(*arg)) while (eval_isnamec(*arg)) ++arg; ! if (check_defined(p, arg - p, cctx) == FAIL) goto erret; as_name = vim_strnsave(p, arg - p); arg = skipwhite_and_linebreak(arg, evalarg); *** ../vim-8.2.1147/src/version.c 2020-07-06 21:24:53.097898730 +0200 --- src/version.c 2020-07-06 21:52:50.100794807 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1148, /**/ -- For large projects, Team Leaders use sophisticated project management software to keep track of who's doing what. The software collects the lies and guesses of the project team and organizes them in to instantly outdated charts that are too boring to look at closely. This is called "planning". (Scott Adams - The Dilbert principle) /// 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 ///