changeset 21497:766839794e09 v8.2.1299

patch 8.2.1299: compiler warning for using size_t for int and void pointer Commit: https://github.com/vim/vim/commit/d3bb6a82a51d549bbd597bb4e94d8f074009be2a Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jul 26 15:55:25 2020 +0200 patch 8.2.1299: compiler warning for using size_t for int and void pointer Problem: Compiler warning for using size_t for int and void pointer. Solution: Add type casts.
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Jul 2020 16:00:06 +0200
parents a0de640b35da
children 134699e667ee
files src/scriptfile.c src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -157,18 +157,18 @@ estack_sfile(int is_sfile UNUSED)
 		last_type = entry->es_type;
 	    }
 	    len += STRLEN(type_name);
-	    if (ga_grow(&ga, len) == FAIL)
+	    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 <slnum>.  Also leave it out when the number is not set.
-		vim_snprintf(ga.ga_data + ga.ga_len, len, "%s%s%s",
+		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(ga.ga_data + ga.ga_len, len, "%s%s[%ld]..",
+		vim_snprintf((char *)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);
+	    ga.ga_len += (int)STRLEN((char *)ga.ga_data + ga.ga_len);
 	}
     }
 
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1299,
+/**/
     1298,
 /**/
     1297,