From bd6406f15db210b78fa24dece3bd021a7ac085dc Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 14 Apr 2021 21:30:06 +0200 Subject: [PATCH] patch 8.2.2767: compiler warning for unused argument Problem: Compiler warning for unused argument. Solution: Remove the argument. --- src/blob.c | 2 +- src/eval.c | 3 +-- src/proto/blob.pro | 2 +- src/version.c | 2 ++ src/vim9execute.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/blob.c b/src/blob.c index f020966ae..114dacdec 100644 --- a/src/blob.c +++ b/src/blob.c @@ -340,7 +340,7 @@ blob_slice_or_index( * 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) +check_blob_index(long bloblen, varnumber_T n1, int quiet) { if (n1 < 0 || n1 > bloblen) { diff --git a/src/eval.c b/src/eval.c index d8607f2be..f8e922f91 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1175,8 +1175,7 @@ get_lval( lp->ll_n1 = (long)tv_get_number(&var1); clear_tv(&var1); - if (check_blob_index(bloblen, lp->ll_n1, lp->ll_range, quiet) - == FAIL) + if (check_blob_index(bloblen, lp->ll_n1, quiet) == FAIL) { clear_tv(&var2); return NULL; diff --git a/src/proto/blob.pro b/src/proto/blob.pro index 0b7cbd3a8..3adaf0ffe 100644 --- a/src/proto/blob.pro +++ b/src/proto/blob.pro @@ -14,7 +14,7 @@ int write_blob(FILE *fd, blob_T *blob); 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_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); diff --git a/src/version.c b/src/version.c index cdf37d86f..085a182ed 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2767, /**/ 2766, /**/ diff --git a/src/vim9execute.c b/src/vim9execute.c index bdf4a02b7..b7db0e294 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -2282,7 +2282,7 @@ call_def_function( long bloblen = blob_len(tv_dest->vval.v_blob); if (check_blob_index(bloblen, - n1, TRUE, FALSE) == FAIL + n1, FALSE) == FAIL || check_blob_range(bloblen, n1, n2, FALSE) == FAIL) status = FAIL; -- 2.40.0