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.

diff --git a/src/scriptfile.c b/src/scriptfile.c
index 2a8320832ee7b24ee7ba53a74548b309ea525e01..b93e3513807f076684bb77319f94751e0e264701 100644 (file)
--- 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);
        }
     }
 

diff --git a/src/version.c b/src/version.c
index 58a434a1b667bf679c7bd50e8a5f984804a58e29..93bcc43247dc575de5353db20be4a0e4a424c080 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1299,
 /**/
     1298,
 /**/