patch 8.2.0967: unnecessary type casts for vim_strnsave()

Problem:    Unnecessary type casts for vim_strnsave().
Solution:   Remove the type casts.

diff --git a/src/evalvars.c b/src/evalvars.c
index 3d03ed8f1b95946d74ed82565820e97a4533896a..f2128a6fcaef7289530494724df53ad79d25d4ed 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2534,7 +2534,7 @@ lookup_scriptvar(char_u *name, size_t len, cctx_T *dummy UNUSED)
     }
     else
     {
-       p = vim_strnsave(name, (int)len);
+       p = vim_strnsave(name, len);
        if (p == NULL)
            return NULL;
     }

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 2280fcfa06f99a942604d220ca039fc198303fc6..11894f638759e877fc4a91276d19d1d89053e880 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3221,7 +3221,7 @@ ex_append(exarg_T *eap)
            p = vim_strchr(eap->nextcmd, NL);
            if (p == NULL)
                p = eap->nextcmd + STRLEN(eap->nextcmd);
-           theline = vim_strnsave(eap->nextcmd, (int)(p - eap->nextcmd));
+           theline = vim_strnsave(eap->nextcmd, p - eap->nextcmd);
            if (*p != NUL)
                ++p;
            eap->nextcmd = p;

diff --git a/src/ex_eval.c b/src/ex_eval.c
index 68207cbe7c3e9bece8824b3412343cac092d9191..a13f844b1439335052d9483e5550da4691cb44e5 100644 (file)
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -439,7 +439,7 @@ get_exception_string(
        {
            cmdlen = (int)STRLEN(cmdname);
            ret = (char *)vim_strnsave((char_u *)"Vim(",
-                                          4 + cmdlen + 2 + (int)STRLEN(mesg));
+                                               4 + cmdlen + 2 + STRLEN(mesg));
            if (ret == NULL)
                return ret;
            STRCPY(&ret[4], cmdname);
@@ -448,7 +448,7 @@ get_exception_string(
        }
        else
        {
-           ret = (char *)vim_strnsave((char_u *)"Vim:", 4 + (int)STRLEN(mesg));
+           ret = (char *)vim_strnsave((char_u *)"Vim:", 4 + STRLEN(mesg));
            if (ret == NULL)
                return ret;
            val = ret + 4;
@@ -806,7 +806,7 @@ report_pending(int action, int pending, void *value)
            if (pending & CSTP_THROW)
            {
                vim_snprintf((char *)IObuff, IOSIZE, mesg, _("Exception"));
-               mesg = (char *)vim_strnsave(IObuff, (int)STRLEN(IObuff) + 4);
+               mesg = (char *)vim_strnsave(IObuff, STRLEN(IObuff) + 4);
                STRCAT(mesg, ": %s");
                s = (char *)((except_T *)value)->value;
            }

diff --git a/src/fileio.c b/src/fileio.c
index 3896ba8a63ce8729e4d9021257fa39fec98e44de..7b605296b74aba111e45f25fa5943ba12ece0fb4 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2724,7 +2724,7 @@ next_fenc(char_u **pp, int *alloced)
     }
     else
     {
-       r = vim_strnsave(*pp, (int)(p - *pp));
+       r = vim_strnsave(*pp, p - *pp);
        *pp = p + 1;
        if (r != NULL)
        {

diff --git a/src/filepath.c b/src/filepath.c
index 4a4948ad6e9c687f1f50845853408b2bd52bff67..90d04cfcf1f73e40cc488e64b5d615c1741a0dbd 100644 (file)
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -389,7 +389,7 @@ repeat:
        if (mch_isdir(*fnamep))
        {
            // Make room for one or two extra characters.
-           *fnamep = vim_strnsave(*fnamep, (int)STRLEN(*fnamep) + 2);
+           *fnamep = vim_strnsave(*fnamep, STRLEN(*fnamep) + 2);
            vim_free(*bufp);    // free any allocated file name
            *bufp = *fnamep;
            if (*fnamep == NULL)
@@ -655,7 +655,7 @@ repeat:
            p = vim_strchr(s, sep);
            if (p != NULL)
            {
-               pat = vim_strnsave(s, (int)(p - s));
+               pat = vim_strnsave(s, p - s);
                if (pat != NULL)
                {
                    s = p + 1;
@@ -663,7 +663,7 @@ repeat:
                    p = vim_strchr(s, sep);
                    if (p != NULL)
                    {
-                       sub = vim_strnsave(s, (int)(p - s));
+                       sub = vim_strnsave(s, p - s);
                        str = vim_strnsave(*fnamep, *fnamelen);
                        if (sub != NULL && str != NULL)
                        {
@@ -1296,7 +1296,7 @@ mkdir_recurse(char_u *dir, int prot)
        return OK;
 
     // If the directory exists we're done.  Otherwise: create it.
-    updir = vim_strnsave(dir, (int)(p - dir));
+    updir = vim_strnsave(dir, p - dir);
     if (updir == NULL)
        return FAIL;
     if (mch_isdir(updir))
@@ -1594,7 +1594,7 @@ f_readfile(typval_T *argvars, typval_T *rettv)
                            --prevlen;
                }
                if (prevlen == 0)
-                   s = vim_strnsave(start, (int)len);
+                   s = vim_strnsave(start, len);
                else
                {
                    // Change "prev" buffer to be the right size.  This way
@@ -3037,7 +3037,7 @@ expand_backtick(
     int                i;
 
     // Create the command: lop off the backticks.
-    cmd = vim_strnsave(pat + 1, (int)STRLEN(pat) - 2);
+    cmd = vim_strnsave(pat + 1, STRLEN(pat) - 2);
     if (cmd == NULL)
        return -1;
 

diff --git a/src/findfile.c b/src/findfile.c
index a6bec9788a831160629ea4c0b25a5d01bb8da864..2139d8bae614b7ca1c35aeed81c73c609987e372 100644 (file)
--- a/src/findfile.c
+++ b/src/findfile.c
@@ -451,7 +451,7 @@ vim_findfile_init(
                if (walker)
                {
                    search_ctx->ffsc_stopdirs_v[dircount-1] =
-                                vim_strnsave(helper, (int)(walker - helper));
+                                        vim_strnsave(helper, walker - helper);
                    walker++;
                }
                else
@@ -484,7 +484,7 @@ vim_findfile_init(
        char    *errpt;
 
        // save the fix part of the path
-       search_ctx->ffsc_fix_path = vim_strnsave(path, (int)(wc_part - path));
+       search_ctx->ffsc_fix_path = vim_strnsave(path, wc_part - path);
 
        /*
         * copy wc_path and add restricts to the '**' wildcard.

diff --git a/src/highlight.c b/src/highlight.c
index 5d123ac877e73cb42d6ee4d7c081294e11892af6..dacce5c497db4d98bbd741953735ce90148444e8 100644 (file)
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -963,7 +963,7 @@ do_highlight(
            break;
        }
        vim_free(arg);
-       arg = vim_strnsave(arg_start, (int)(linep - arg_start));
+       arg = vim_strnsave(arg_start, linep - arg_start);
        if (arg == NULL)
        {
            error = TRUE;
@@ -5003,7 +5003,7 @@ ex_match(exarg_T *eap)
     {
        p = skiptowhite(eap->arg);
        if (!eap->skip)
-           g = vim_strnsave(eap->arg, (int)(p - eap->arg));
+           g = vim_strnsave(eap->arg, p - eap->arg);
        p = skipwhite(p);
        if (*p == NUL)
        {

diff --git a/src/if_perl.xs b/src/if_perl.xs
index ef02730479e31f8178a6772c2930fcefdc896f5f..9a99fc08fca1368cac07c35a34c293c1fb6b9132 100644 (file)
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -1435,7 +1435,7 @@ PerlIOVim_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
     char_u *str;
     PerlIOVim * s = PerlIOSelf(f, PerlIOVim);
 
-    str = vim_strnsave((char_u *)vbuf, (int)count);
+    str = vim_strnsave((char_u *)vbuf, count);
     if (str == NULL)
        return 0;
     msg_split((char_u *)str, s->attr);

diff --git a/src/if_ruby.c b/src/if_ruby.c
index 2480ee4d12149080d79d5299f322ddd1c7c6931a..692af4cb2e5bd07f285d60ff50cd8cd62116a9a8 100644 (file)
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -1858,7 +1858,7 @@ ruby_convert_to_vim_value(VALUE val, typval_T *rettv)
 
                rettv->v_type = VAR_STRING;
                rettv->vval.v_string = vim_strnsave((char_u *)RSTRING_PTR(str),
-                                                        (int)RSTRING_LEN(str));
+                                                            RSTRING_LEN(str));
            }
            break;
        case T_ARRAY:

diff --git a/src/insexpand.c b/src/insexpand.c
index 6963baf9874002dc407b4a0f5282f692e2fd6a07..03dddc3ee71148f15e5eb0ed231b7c9136d1098c 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -1579,7 +1579,7 @@ ins_compl_bs(void)
        ins_compl_restart();
 
     vim_free(compl_leader);
-    compl_leader = vim_strnsave(line + compl_col, (int)(p - line) - compl_col);
+    compl_leader = vim_strnsave(line + compl_col, (p - line) - compl_col);
     if (compl_leader != NULL)
     {
        ins_compl_new_leader();
@@ -1706,7 +1706,7 @@ ins_compl_addleader(int c)
     {
        vim_free(compl_leader);
        compl_leader = vim_strnsave(ml_get_curline() + compl_col,
-                                    (int)(curwin->w_cursor.col - compl_col));
+                                            curwin->w_cursor.col - compl_col);
        if (compl_leader != NULL)
            ins_compl_new_leader();
     }

diff --git a/src/json.c b/src/json.c
index 2720abfca49990a94c2746e112b63b71792ca249..8eb6680beab638f9821cdfb537fe167c5c71f502 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -662,7 +662,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
            if (cur_item != NULL)
            {
                cur_item->v_type = VAR_STRING;
-               cur_item->vval.v_string = vim_strnsave(key, (int)(p - key));
+               cur_item->vval.v_string = vim_strnsave(key, p - key);
                top_item->jd_key = cur_item->vval.v_string;
            }
            reader->js_used += (int)(p - key);

diff --git a/src/mark.c b/src/mark.c
index 298da67e8478a8a5ce91c641f43304194fef58b1..948a1826ec16665d1c4602a603e17918ebaa2346 100644 (file)
--- a/src/mark.c
+++ b/src/mark.c
@@ -680,7 +680,7 @@ mark_line(pos_T *mp, int lead_len)
     if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count)
        return vim_strsave((char_u *)"-invalid-");
     // Allow for up to 5 bytes per character.
-    s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns * 5);
+    s = vim_strnsave(skipwhite(ml_get(mp->lnum)), Columns * 5);
     if (s == NULL)
        return NULL;
     // Truncate the line to fit it in the window.

diff --git a/src/memline.c b/src/memline.c
index 73db42f9806f065f5dda32bbc5f1590353099744..347b44d6a131767caafccbbe88728a4a4709c312 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -1375,7 +1375,7 @@ ml_recover(int checkext)
 #endif
        for (p = b0p->b0_fname + fnsize; p > b0p->b0_fname && p[-1] != NUL; --p)
            ;
-       b0_fenc = vim_strnsave(p, (int)(b0p->b0_fname + fnsize - p));
+       b0_fenc = vim_strnsave(p, b0p->b0_fname + fnsize - p);
     }
 
     mf_put(mfp, hp, FALSE, FALSE);     // release block 0

diff --git a/src/menu.c b/src/menu.c
index b01792594b06d4bcc4dce8ef789fa17c6c01541c..8a69edd1ab8ad260d73618628bda18a42214f272 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -1810,7 +1810,7 @@ menu_text(char_u *str, int *mnemonic, char_u **actext)
     {
        if (actext != NULL)
            *actext = vim_strsave(p + 1);
-       text = vim_strnsave(str, (int)(p - str));
+       text = vim_strnsave(str, p - str);
     }
     else
        text = vim_strsave(str);
@@ -2716,7 +2716,7 @@ ex_menutranslate(exarg_T *eap UNUSED)
                if (from != NULL)
                {
                    from_noamp = menu_text(from, NULL, NULL);
-                   to = vim_strnsave(to, (int)(arg - to));
+                   to = vim_strnsave(to, arg - to);
                    if (from_noamp != NULL && to != NULL)
                    {
                        menu_translate_tab_and_shift(from);

diff --git a/src/misc1.c b/src/misc1.c
index db76d9bfa86ed310a8e87b29b8dc96eeb122f581..bab9e680a72580c3b41017e701a2bfdabb5dcda7 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -1795,7 +1795,7 @@ vim_getenv(char_u *name, int *mustfree)
            if (p == exe_name || p == p_hf)
 #endif
                // check that the result is a directory name
-               p = vim_strnsave(p, (int)(pend - p));
+               p = vim_strnsave(p, pend - p);
 
            if (p != NULL && !mch_isdir(p))
                VIM_CLEAR(p);
@@ -2576,7 +2576,7 @@ get_isolated_shell_name(void)
 
 #ifdef MSWIN
     p = gettail(p_sh);
-    p = vim_strnsave(p, (int)(skiptowhite(p) - p));
+    p = vim_strnsave(p, skiptowhite(p) - p);
 #else
     p = skiptowhite(p_sh);
     if (*p == NUL)
@@ -2593,7 +2593,7 @@ get_isolated_shell_name(void)
        for (p2 = p_sh; p2 < p; MB_PTR_ADV(p2))
            if (vim_ispathsep(*p2))
                p1 = p2 + 1;
-       p = vim_strnsave(p1, (int)(p - p1));
+       p = vim_strnsave(p1, p - p1);
     }
 #endif
     return p;

diff --git a/src/ops.c b/src/ops.c
index 8f31deb67a33e9e518e6c6cdf856b3091abc8ee0..a681df0dc39c0f66ee480efa9a8f3306339347bd 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -1616,7 +1616,7 @@ op_insert(oparg_T *oap, long count1)
        if (pre_textlen >= 0
                     && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
        {
-           ins_text = vim_strnsave(firstline, (int)ins_len);
+           ins_text = vim_strnsave(firstline, ins_len);
            if (ins_text != NULL)
            {
                // block handled here

diff --git a/src/os_win32.c b/src/os_win32.c
index 6356076eb91fca60a1c07d2fecb7c57836a1a566..43ad1026d5d0ef2203438106729f69b881f5ac36 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -477,8 +477,7 @@ get_exe_name(void)
 
     if (exe_path == NULL && exe_name != NULL)
     {
-       exe_path = vim_strnsave(exe_name,
-                                    (int)(gettail_sep(exe_name) - exe_name));
+       exe_path = vim_strnsave(exe_name, gettail_sep(exe_name) - exe_name);
        if (exe_path != NULL)
        {
            // Append our starting directory to $PATH, so that when doing

diff --git a/src/regexp.c b/src/regexp.c
index c222d9c2eeb2a197bfa6dbb87ff45b4ae6b27c22..de0b0fad43700241a7588d58a6a4a345307dddf8 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1846,7 +1846,7 @@ fill_submatch_list(int argc UNUSED, typval_T *argv, int argskip, int argcount)
        if (s == NULL || rsm.sm_match->endp[i] == NULL)
            s = NULL;
        else
-           s = vim_strnsave(s, (int)(rsm.sm_match->endp[i] - s));
+           s = vim_strnsave(s, rsm.sm_match->endp[i] - s);
        li->li_tv.v_type = VAR_STRING;
        li->li_tv.vval.v_string = s;
        li = li->li_next;
@@ -2462,7 +2462,7 @@ reg_submatch(int no)
        if (s == NULL || rsm.sm_match->endp[no] == NULL)
            retval = NULL;
        else
-           retval = vim_strnsave(s, (int)(rsm.sm_match->endp[no] - s));
+           retval = vim_strnsave(s, rsm.sm_match->endp[no] - s);
     }
 
     return retval;

diff --git a/src/regexp_bt.c b/src/regexp_bt.c
index fef66e42fa1c116da44308c659fcc3b3a9904469..d19515addeba7e98311a137f05ab1789c2fd943a 100644 (file)
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -4588,7 +4588,7 @@ regtry(
                if (reg_startzp[i] != NULL && reg_endzp[i] != NULL)
                    re_extmatch_out->matches[i] =
                            vim_strnsave(reg_startzp[i],
-                                       (int)(reg_endzp[i] - reg_startzp[i]));
+                                               reg_endzp[i] - reg_startzp[i]);
            }
        }
     }

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index a55750b19983d6e338c63dc229384c14edabd82e..444b446ca6f602af6d6c06e04f64751599decb60 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7103,8 +7103,7 @@ nfa_regtry(
 
                if (lpos->start != NULL && lpos->end != NULL)
                    re_extmatch_out->matches[i] =
-                           vim_strnsave(lpos->start,
-                                             (int)(lpos->end - lpos->start));
+                           vim_strnsave(lpos->start, lpos->end - lpos->start);
            }
        }
     }

diff --git a/src/register.c b/src/register.c
index 3968b07fb4b6859f9515f6c897b272ced37a6a03..2db5136d0f62c23ff89136b87e5b505362127ddd 100644 (file)
--- a/src/register.c
+++ b/src/register.c
@@ -2655,7 +2655,7 @@ write_reg_contents_ex(
     {
        char_u      *p, *s;
 
-       p = vim_strnsave(str, (int)len);
+       p = vim_strnsave(str, len);
        if (p == NULL)
            return;
        if (must_append && expr_line != NULL)

diff --git a/src/search.c b/src/search.c
index 7a4cdb7b6c39ba1ec09bb4b4676a16f47d3d2e1d..91a26dd36a6f0df7519f7c8e3d03628dfb504ed7 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1916,7 +1916,7 @@ find_rawstring_end(char_u *linep, pos_T *startpos, pos_T *endpos)
     for (p = linep + startpos->col + 1; *p && *p != '('; ++p)
        ;
     delim_len = (p - linep) - startpos->col - 1;
-    delim_copy = vim_strnsave(linep + startpos->col + 1, (int)delim_len);
+    delim_copy = vim_strnsave(linep + startpos->col + 1, delim_len);
     if (delim_copy == NULL)
        return FALSE;
     for (lnum = startpos->lnum; lnum <= endpos->lnum; ++lnum)

diff --git a/src/sign.c b/src/sign.c
index 576c4d01fcc672160a8fd108affe9c469dd0b44c..a3dfaf034fc667a8d8946fd2ee168acce61dfbf1 100644 (file)
--- a/src/sign.c
+++ b/src/sign.c
@@ -1309,22 +1309,22 @@ sign_define_cmd(char_u *sign_name, char_u *cmdline)
        if (STRNCMP(arg, "icon=", 5) == 0)
        {
            arg += 5;
-           icon = vim_strnsave(arg, (int)(p - arg));
+           icon = vim_strnsave(arg, p - arg);
        }
        else if (STRNCMP(arg, "text=", 5) == 0)
        {
            arg += 5;
-           text = vim_strnsave(arg, (int)(p - arg));
+           text = vim_strnsave(arg, p - arg);
        }
        else if (STRNCMP(arg, "linehl=", 7) == 0)
        {
            arg += 7;
-           linehl = vim_strnsave(arg, (int)(p - arg));
+           linehl = vim_strnsave(arg, p - arg);
        }
        else if (STRNCMP(arg, "texthl=", 7) == 0)
        {
            arg += 7;
-           texthl = vim_strnsave(arg, (int)(p - arg));
+           texthl = vim_strnsave(arg, p - arg);
        }
        else
        {

diff --git a/src/syntax.c b/src/syntax.c
index 5c9dd0b0225c76591d80637391a213060fed80c8..6bbe4baccff1bbb3819bb8c2bf3629e50426ff5c 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -4652,7 +4652,7 @@ get_syn_options(
                arg = skiptowhite(arg);
                if (gname_start == arg)
                    return NULL;
-               gname = vim_strnsave(gname_start, (int)(arg - gname_start));
+               gname = vim_strnsave(gname_start, arg - gname_start);
                if (gname == NULL)
                    return NULL;
                if (STRCMP(gname, "NONE") == 0)
@@ -4662,7 +4662,8 @@ get_syn_options(
                    syn_id = syn_name2id(gname);
                    for (i = curwin->w_s->b_syn_patterns.ga_len; --i >= 0; )
                        if (SYN_ITEMS(curwin->w_s)[i].sp_syn.id == syn_id
-                             && SYN_ITEMS(curwin->w_s)[i].sp_type == SPTYPE_START)
+                             && SYN_ITEMS(curwin->w_s)[i].sp_type
+                                                              == SPTYPE_START)
                        {
                            *opt->sync_idx = i;
                            break;
@@ -5656,7 +5657,7 @@ get_syn_pattern(char_u *arg, synpat_T *ci)
        return NULL;
     }
     // store the pattern and compiled regexp program
-    if ((ci->sp_pattern = vim_strnsave(arg + 1, (int)(end - arg - 1))) == NULL)
+    if ((ci->sp_pattern = vim_strnsave(arg + 1, end - arg - 1)) == NULL)
        return NULL;
 
     // Make 'cpoptions' empty, to avoid the 'l' flag
@@ -5836,8 +5837,9 @@ syn_cmd_sync(exarg_T *eap, int syncing UNUSED)
            if (!eap->skip)
            {
                // store the pattern and compiled regexp program
-               if ((curwin->w_s->b_syn_linecont_pat = vim_strnsave(next_arg + 1,
-                                     (int)(arg_end - next_arg - 1))) == NULL)
+               if ((curwin->w_s->b_syn_linecont_pat =
+                           vim_strnsave(next_arg + 1,
+                                     arg_end - next_arg - 1)) == NULL)
                {
                    finished = TRUE;
                    break;
@@ -6272,7 +6274,7 @@ ex_syntax(exarg_T *eap)
     // isolate subcommand name
     for (subcmd_end = arg; ASCII_ISALPHA(*subcmd_end); ++subcmd_end)
        ;
-    subcmd_name = vim_strnsave(arg, (int)(subcmd_end - arg));
+    subcmd_name = vim_strnsave(arg, subcmd_end - arg);
     if (subcmd_name != NULL)
     {
        if (eap->skip)          // skip error messages for all subcommands

diff --git a/src/term.c b/src/term.c
index 2f6e89343e58fc509fd033c17b0ab0a59a632aa3..82b1126e7e4cf7f390c9971d88ef96156ee3f09b 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -4086,11 +4086,11 @@ add_termcode(char_u *name, char_u *string, int flags)
     }
 
 #if defined(MSWIN) && !defined(FEAT_GUI)
-    s = vim_strnsave(string, (int)STRLEN(string) + 1);
+    s = vim_strnsave(string, STRLEN(string) + 1);
 #else
 # ifdef VIMDLL
     if (!gui.in_use)
-       s = vim_strnsave(string, (int)STRLEN(string) + 1);
+       s = vim_strnsave(string, STRLEN(string) + 1);
     else
 # endif
        s = vim_strsave(string);

diff --git a/src/terminal.c b/src/terminal.c
index 5514c73ea04a030d20b8a4f25011dad334d75068..5424574868d0d49bbecf1236978a77571ee780b3 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3011,7 +3011,7 @@ handle_settermprop(
     {
        case VTERM_PROP_TITLE:
            strval = vim_strnsave((char_u *)value->string.str,
-                                                      (int)value->string.len);
+                                                           value->string.len);
            if (strval == NULL)
                break;
            vim_free(term->tl_title);
@@ -3073,7 +3073,7 @@ handle_settermprop(
 
        case VTERM_PROP_CURSORCOLOR:
            strval = vim_strnsave((char_u *)value->string.str,
-                                                      (int)value->string.len);
+                                                           value->string.len);
            if (strval == NULL)
                break;
            cursor_color_copy(&term->tl_cursor_color, strval);

diff --git a/src/undo.c b/src/undo.c
index c2fe819460ba7d3863501a703e504693e07c7a24..7c1e5975edbff4962f87c8bf63673ab734090595 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -849,7 +849,7 @@ u_get_undo_file_name(char_u *buf_ffname, int reading)
        {
            // Use same directory as the ffname,
            // "dir/name" -> "dir/.name.un~"
-           undo_file_name = vim_strnsave(ffname, (int)(STRLEN(ffname) + 5));
+           undo_file_name = vim_strnsave(ffname, STRLEN(ffname) + 5);
            if (undo_file_name == NULL)
                break;
            p = gettail(undo_file_name);

diff --git a/src/usercmd.c b/src/usercmd.c
index cdc46a10b9550933582da46048335243e63cf914..de49d4199c76138d035949c4f8cdc2f860fdb9f3 100644 (file)
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -676,7 +676,7 @@ parse_compl_arg(
     }
 
     if (arg != NULL)
-       *compl_arg = vim_strnsave(arg, (int)arglen);
+       *compl_arg = vim_strnsave(arg, arglen);
 # endif
     return OK;
 }
@@ -939,7 +939,7 @@ uc_add_command(
     {
        if (ga_grow(gap, 1) != OK)
            goto fail;
-       if ((p = vim_strnsave(name, (int)name_len)) == NULL)
+       if ((p = vim_strnsave(name, name_len)) == NULL)
            goto fail;
 
        cmd = USER_CMD_GA(gap, i);

diff --git a/src/userfunc.c b/src/userfunc.c
index e2658fe596c8198c07129b4cf2ed92d0f05c98b6..bd229b4d94f6aaeb7eed311b0e317fa35ff3ff6f 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2699,7 +2699,7 @@ def_function(exarg_T *eap, char_u *name_arg)
            p = skip_type(ret_type);
            if (p > ret_type)
            {
-               ret_type = vim_strnsave(ret_type, (int)(p - ret_type));
+               ret_type = vim_strnsave(ret_type, p - ret_type);
                p = skipwhite(p);
            }
            else
@@ -2972,12 +2972,12 @@ def_function(exarg_T *eap, char_u *name_arg)
                    // Ignore leading white space.
                    p = skipwhite(p + 4);
                    heredoc_trimmed = vim_strnsave(theline,
-                           (int)(skipwhite(theline) - theline));
+                                                skipwhite(theline) - theline);
                }
                if (*p == NUL)
                    skip_until = vim_strsave((char_u *)".");
                else
-                   skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
+                   skip_until = vim_strnsave(p, skiptowhite(p) - p);
                do_concat = FALSE;
                is_heredoc = TRUE;
            }
@@ -3002,9 +3002,9 @@ def_function(exarg_T *eap, char_u *name_arg)
                        // Ignore leading white space.
                        p = skipwhite(p + 4);
                        heredoc_trimmed = vim_strnsave(theline,
-                                         (int)(skipwhite(theline) - theline));
+                                                skipwhite(theline) - theline);
                    }
-                   skip_until = vim_strnsave(p, (int)(skiptowhite(p) - p));
+                   skip_until = vim_strnsave(p, skiptowhite(p) - p);
                    do_concat = FALSE;
                    is_heredoc = TRUE;
                }

diff --git a/src/version.c b/src/version.c
index fc2269c2d90a9695c4bc12bc6db20da2ed49b39d..dcf17460f556d456b4850ed7d487c233d580c6f9 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 */
+/**/
+    967,
 /**/
     966,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index f59ec12b7f0472497242f798b165c2b540126cb2..17c16d84c1237570170bea43c40c901448dbebb9 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1575,7 +1575,7 @@ generate_STRINGMEMBER(cctx_T *cctx, char_u *name, size_t len)
     RETURN_OK_IF_SKIP(cctx);
     if ((isn = generate_instr(cctx, ISN_STRINGMEMBER)) == NULL)
        return FAIL;
-    isn->isn_arg.string = vim_strnsave(name, (int)len);
+    isn->isn_arg.string = vim_strnsave(name, len);
 
     // check for dict type
     type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
@@ -1671,7 +1671,7 @@ reserve_local(cctx_T *cctx, char_u *name, size_t len, int isConst, type_T *type)
     // entries.  This is less efficient, but memory is cheap these days.
     lvar->lv_idx = cctx->ctx_locals_count++;
 
-    lvar->lv_name = vim_strnsave(name, (int)(len == 0 ? STRLEN(name) : len));
+    lvar->lv_name = vim_strnsave(name, len == 0 ? STRLEN(name) : len);
     lvar->lv_const = isConst;
     lvar->lv_type = type;
 
@@ -4627,7 +4627,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
        --p;
 
     varlen = p - arg;
-    name = vim_strnsave(arg, (int)varlen);
+    name = vim_strnsave(arg, varlen);
     if (name == NULL)
        return NULL;
 
@@ -6268,7 +6268,7 @@ compile_exec(char_u *line, exarg_T *eap, cctx_T *cctx)
        {
            if (p > start)
            {
-               generate_PUSHS(cctx, vim_strnsave(start, (int)(p - start)));
+               generate_PUSHS(cctx, vim_strnsave(start, p - start));
                ++count;
            }
            p += 2;