Skip to content

Commit

Permalink
patch 8.2.4773: build failure without the +eval feature
Browse files Browse the repository at this point in the history
Problem:    Build failure without the +eval feature.
Solution:   Use other error message.  Avoid warnings.
  • Loading branch information
brammool committed Apr 17, 2022
1 parent 3df8f6e commit a9549c9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/cindent.c
Expand Up @@ -420,7 +420,7 @@ cin_islabel_skip(char_u **s)
}

/*
* Recognize a "public/private/protected" scope declaration label.
* Recognize a scope declaration label from the 'cinscopedecls' option.
*/
static int
cin_isscopedecl(char_u *p)
Expand All @@ -440,7 +440,7 @@ cin_isscopedecl(char_u *p)

for (cinsd = curbuf->b_p_cinsd; *cinsd; )
{
len = copy_option_part(&cinsd, cinsd_buf, cinsd_len, ",");
len = copy_option_part(&cinsd, cinsd_buf, (int)cinsd_len, ",");
if (STRNCMP(s, cinsd_buf, len) == 0)
{
skip = cin_skipcomment(s + len);
Expand Down
2 changes: 1 addition & 1 deletion src/misc1.c
Expand Up @@ -2343,7 +2343,7 @@ get_cmd_output(
|| (len = ftell(fd)) == -1 // get size of temp file
|| fseek(fd, 0L, SEEK_SET) == -1) // back to the start
{
semsg(_(e_cannot_read_from_str), tempname);
semsg(_(e_cannot_read_from_str_2), tempname);
if (fd != NULL)
fclose(fd);
goto done;
Expand Down
10 changes: 5 additions & 5 deletions src/term.c
Expand Up @@ -5957,7 +5957,7 @@ replace_termcodes(
int i;
int slen;
int key;
int dlen = 0;
size_t dlen = 0;
char_u *src;
int do_backslash; // backslash is a special character
int do_special; // recognize <> key codes
Expand All @@ -5977,7 +5977,7 @@ replace_termcodes(
* In the rare case more might be needed ga_grow() must be called again.
*/
ga_init2(&ga, 1L, 100);
if (ga_grow(&ga, STRLEN(src) * 6 + 1) == FAIL) // out of memory
if (ga_grow(&ga, (int)(STRLEN(src) * 6 + 1)) == FAIL) // out of memory
{
*bufp = NULL;
return from;
Expand Down Expand Up @@ -6044,8 +6044,8 @@ replace_termcodes(
// Turn "<SID>name.Func"
// into "scriptname#Func".
len = STRLEN(si->sn_autoload_prefix);
if (ga_grow(&ga, STRLEN(src) * 6 + len + 1)
== FAIL)
if (ga_grow(&ga,
(int)(STRLEN(src) * 6 + len + 1)) == FAIL)
{
ga_clear(&ga);
*bufp = NULL;
Expand All @@ -6064,7 +6064,7 @@ replace_termcodes(
result[dlen++] = (int)KS_EXTRA;
result[dlen++] = (int)KE_SNR;
sprintf((char *)result + dlen, "%ld", sid);
dlen += (int)STRLEN(result + dlen);
dlen += STRLEN(result + dlen);
result[dlen++] = '_';
continue;
}
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -746,6 +746,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4773,
/**/
4772,
/**/
Expand Down

0 comments on commit a9549c9

Please sign in to comment.