To: vim_dev@googlegroups.com Subject: Patch 8.2.2767 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2767 (after 8.2.2765) Problem: Compiler warning for unused argument. Solution: Remove the argument. Files: src/blob.c, src/proto/blob.pro, src/vim9execute.c, src/eval.c *** ../vim-8.2.2766/src/blob.c 2021-04-14 20:35:19.400232653 +0200 --- src/blob.c 2021-04-14 21:27:45.676308722 +0200 *************** *** 340,346 **** * Check if "n1"- is a valid index for a blobl with length "bloblen". */ int ! check_blob_index(long bloblen, varnumber_T n1, int is_range, int quiet) { if (n1 < 0 || n1 > bloblen) { --- 340,346 ---- * Check if "n1"- is a valid index for a blobl with length "bloblen". */ int ! check_blob_index(long bloblen, varnumber_T n1, int quiet) { if (n1 < 0 || n1 > bloblen) { *** ../vim-8.2.2766/src/proto/blob.pro 2021-04-14 20:35:19.400232653 +0200 --- src/proto/blob.pro 2021-04-14 21:28:37.240180206 +0200 *************** *** 14,20 **** char_u *blob2string(blob_T *blob, char_u **tofree, char_u *numbuf); blob_T *string2blob(char_u *str); int blob_slice_or_index(blob_T *blob, int is_range, varnumber_T n1, varnumber_T n2, int exclusive, typval_T *rettv); ! int check_blob_index(long bloblen, varnumber_T n1, int is_range, int quiet); int check_blob_range(long bloblen, varnumber_T n1, varnumber_T n2, int quiet); int blob_set_range(blob_T *dest, long n1, long n2, typval_T *src); void blob_remove(typval_T *argvars, typval_T *rettv); --- 14,20 ---- char_u *blob2string(blob_T *blob, char_u **tofree, char_u *numbuf); blob_T *string2blob(char_u *str); int blob_slice_or_index(blob_T *blob, int is_range, varnumber_T n1, varnumber_T n2, int exclusive, typval_T *rettv); ! int check_blob_index(long bloblen, varnumber_T n1, int quiet); int check_blob_range(long bloblen, varnumber_T n1, varnumber_T n2, int quiet); int blob_set_range(blob_T *dest, long n1, long n2, typval_T *src); void blob_remove(typval_T *argvars, typval_T *rettv); *** ../vim-8.2.2766/src/vim9execute.c 2021-04-14 20:35:19.400232653 +0200 --- src/vim9execute.c 2021-04-14 21:28:21.564219263 +0200 *************** *** 2282,2288 **** long bloblen = blob_len(tv_dest->vval.v_blob); if (check_blob_index(bloblen, ! n1, TRUE, FALSE) == FAIL || check_blob_range(bloblen, n1, n2, FALSE) == FAIL) status = FAIL; --- 2282,2288 ---- long bloblen = blob_len(tv_dest->vval.v_blob); if (check_blob_index(bloblen, ! n1, FALSE) == FAIL || check_blob_range(bloblen, n1, n2, FALSE) == FAIL) status = FAIL; *** ../vim-8.2.2766/src/eval.c 2021-04-14 20:35:19.400232653 +0200 --- src/eval.c 2021-04-14 21:27:57.880278306 +0200 *************** *** 1175,1182 **** lp->ll_n1 = (long)tv_get_number(&var1); clear_tv(&var1); ! if (check_blob_index(bloblen, lp->ll_n1, lp->ll_range, quiet) ! == FAIL) { clear_tv(&var2); return NULL; --- 1175,1181 ---- lp->ll_n1 = (long)tv_get_number(&var1); clear_tv(&var1); ! if (check_blob_index(bloblen, lp->ll_n1, quiet) == FAIL) { clear_tv(&var2); return NULL; *** ../vim-8.2.2766/src/version.c 2021-04-14 20:52:49.197591750 +0200 --- src/version.c 2021-04-14 21:27:41.672318702 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2767, /**/ -- hundred-and-one symptoms of being an internet addict: 95. Only communication in your household is through email. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///