Skip to content

Commit d155d7a

Browse files
brammoolbrammool
committed
patch 8.1.0615: get_tv function names are not consistent
Problem: Get_tv function names are not consistent. Solution: Rename to tv_get.
1 parent 162b714 commit d155d7a

20 files changed

Lines changed: 637 additions & 633 deletions

‎src/channel.c‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ channel_open_func(typval_T *argvars)
938938
jobopt_T opt;
939939
channel_T *channel = NULL;
940940

941-
address = get_tv_string(&argvars[0]);
941+
address = tv_get_string(&argvars[0]);
942942
if (argvars[1].v_type != VAR_UNKNOWN
943943
&& (argvars[1].v_type != VAR_DICT || argvars[1].vval.v_dict == NULL))
944944
{
@@ -4003,7 +4003,7 @@ ch_raw_common(typval_T *argvars, typval_T *rettv, int eval)
40034003
rettv->v_type = VAR_STRING;
40044004
rettv->vval.v_string = NULL;
40054005

4006-
text = get_tv_string_buf(&argvars[1], buf);
4006+
text = tv_get_string_buf(&argvars[1], buf);
40074007
channel = send_common(argvars, text, 0, eval, &opt,
40084008
eval ? "ch_evalraw" : "ch_sendraw", &part_read);
40094009
if (channel != NULL && eval)
@@ -4402,7 +4402,7 @@ channel_get_timeout(channel_T *channel, ch_part_T part)
44024402
static int
44034403
handle_mode(typval_T *item, jobopt_T *opt, ch_mode_T *modep, int jo)
44044404
{
4405-
char_u *val = get_tv_string(item);
4405+
char_u *val = tv_get_string(item);
44064406

44074407
opt->jo_set |= jo;
44084408
if (STRCMP(val, "nl") == 0)
@@ -4424,7 +4424,7 @@ handle_mode(typval_T *item, jobopt_T *opt, ch_mode_T *modep, int jo)
44244424
static int
44254425
handle_io(typval_T *item, ch_part_T part, jobopt_T *opt)
44264426
{
4427-
char_u *val = get_tv_string(item);
4427+
char_u *val = tv_get_string(item);
44284428

44294429
opt->jo_set |= JO_OUT_IO << (part - PART_OUT);
44304430
if (STRCMP(val, "null") == 0)
@@ -4561,7 +4561,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
45614561
{
45624562
if (!(supported & JO_MODE))
45634563
break;
4564-
opt->jo_noblock = get_tv_number(item);
4564+
opt->jo_noblock = tv_get_number(item);
45654565
}
45664566
else if (STRCMP(hi->hi_key, "in_io") == 0
45674567
|| STRCMP(hi->hi_key, "out_io") == 0
@@ -4582,13 +4582,13 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
45824582
break;
45834583
opt->jo_set |= JO_OUT_NAME << (part - PART_OUT);
45844584
opt->jo_io_name[part] =
4585-
get_tv_string_buf_chk(item, opt->jo_io_name_buf[part]);
4585+
tv_get_string_buf_chk(item, opt->jo_io_name_buf[part]);
45864586
}
45874587
else if (STRCMP(hi->hi_key, "pty") == 0)
45884588
{
45894589
if (!(supported & JO_MODE))
45904590
break;
4591-
opt->jo_pty = get_tv_number(item);
4591+
opt->jo_pty = tv_get_number(item);
45924592
}
45934593
else if (STRCMP(hi->hi_key, "in_buf") == 0
45944594
|| STRCMP(hi->hi_key, "out_buf") == 0
@@ -4599,10 +4599,10 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
45994599
if (!(supported & JO_OUT_IO))
46004600
break;
46014601
opt->jo_set |= JO_OUT_BUF << (part - PART_OUT);
4602-
opt->jo_io_buf[part] = get_tv_number(item);
4602+
opt->jo_io_buf[part] = tv_get_number(item);
46034603
if (opt->jo_io_buf[part] <= 0)
46044604
{
4605-
EMSG3(_(e_invargNval), hi->hi_key, get_tv_string(item));
4605+
EMSG3(_(e_invargNval), hi->hi_key, tv_get_string(item));
46064606
return FAIL;
46074607
}
46084608
if (buflist_findnr(opt->jo_io_buf[part]) == NULL)
@@ -4619,7 +4619,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
46194619
if (!(supported & JO_OUT_IO))
46204620
break;
46214621
opt->jo_set |= JO_OUT_MODIFIABLE << (part - PART_OUT);
4622-
opt->jo_modifiable[part] = get_tv_number(item);
4622+
opt->jo_modifiable[part] = tv_get_number(item);
46234623
}
46244624
else if (STRCMP(hi->hi_key, "out_msg") == 0
46254625
|| STRCMP(hi->hi_key, "err_msg") == 0)
@@ -4629,7 +4629,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
46294629
if (!(supported & JO_OUT_IO))
46304630
break;
46314631
opt->jo_set2 |= JO2_OUT_MSG << (part - PART_OUT);
4632-
opt->jo_message[part] = get_tv_number(item);
4632+
opt->jo_message[part] = tv_get_number(item);
46334633
}
46344634
else if (STRCMP(hi->hi_key, "in_top") == 0
46354635
|| STRCMP(hi->hi_key, "in_bot") == 0)
@@ -4648,10 +4648,10 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
46484648
lp = &opt->jo_in_bot;
46494649
opt->jo_set |= JO_IN_BOT;
46504650
}
4651-
*lp = get_tv_number(item);
4651+
*lp = tv_get_number(item);
46524652
if (*lp < 0)
46534653
{
4654-
EMSG3(_(e_invargNval), hi->hi_key, get_tv_string(item));
4654+
EMSG3(_(e_invargNval), hi->hi_key, tv_get_string(item));
46554655
return FAIL;
46564656
}
46574657
}
@@ -4718,7 +4718,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
47184718
else if (STRCMP(hi->hi_key, "drop") == 0)
47194719
{
47204720
int never = FALSE;
4721-
val = get_tv_string(item);
4721+
val = tv_get_string(item);
47224722

47234723
if (STRCMP(val, "never") == 0)
47244724
never = TRUE;
@@ -4747,7 +4747,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
47474747
if (!(supported2 & JO2_TERM_NAME))
47484748
break;
47494749
opt->jo_set2 |= JO2_TERM_NAME;
4750-
opt->jo_term_name = get_tv_string_chk(item);
4750+
opt->jo_term_name = tv_get_string_chk(item);
47514751
if (opt->jo_term_name == NULL)
47524752
{
47534753
EMSG2(_(e_invargval), "term_name");
@@ -4758,7 +4758,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
47584758
{
47594759
if (!(supported2 & JO2_TERM_FINISH))
47604760
break;
4761-
val = get_tv_string(item);
4761+
val = tv_get_string(item);
47624762
if (STRCMP(val, "open") != 0 && STRCMP(val, "close") != 0)
47634763
{
47644764
EMSG3(_(e_invargNval), "term_finish", val);
@@ -4774,7 +4774,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
47744774
if (!(supported2 & JO2_TERM_OPENCMD))
47754775
break;
47764776
opt->jo_set2 |= JO2_TERM_OPENCMD;
4777-
p = opt->jo_term_opencmd = get_tv_string_chk(item);
4777+
p = opt->jo_term_opencmd = tv_get_string_chk(item);
47784778
if (p != NULL)
47794779
{
47804780
/* Must have %d and no other %. */
@@ -4796,7 +4796,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
47964796
if (!(supported2 & JO2_EOF_CHARS))
47974797
break;
47984798
opt->jo_set2 |= JO2_EOF_CHARS;
4799-
p = opt->jo_eof_chars = get_tv_string_chk(item);
4799+
p = opt->jo_eof_chars = tv_get_string_chk(item);
48004800
if (p == NULL)
48014801
{
48024802
EMSG2(_(e_invargval), "eof_chars");
@@ -4808,54 +4808,54 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
48084808
if (!(supported2 & JO2_TERM_ROWS))
48094809
break;
48104810
opt->jo_set2 |= JO2_TERM_ROWS;
4811-
opt->jo_term_rows = get_tv_number(item);
4811+
opt->jo_term_rows = tv_get_number(item);
48124812
}
48134813
else if (STRCMP(hi->hi_key, "term_cols") == 0)
48144814
{
48154815
if (!(supported2 & JO2_TERM_COLS))
48164816
break;
48174817
opt->jo_set2 |= JO2_TERM_COLS;
4818-
opt->jo_term_cols = get_tv_number(item);
4818+
opt->jo_term_cols = tv_get_number(item);
48194819
}
48204820
else if (STRCMP(hi->hi_key, "vertical") == 0)
48214821
{
48224822
if (!(supported2 & JO2_VERTICAL))
48234823
break;
48244824
opt->jo_set2 |= JO2_VERTICAL;
4825-
opt->jo_vertical = get_tv_number(item);
4825+
opt->jo_vertical = tv_get_number(item);
48264826
}
48274827
else if (STRCMP(hi->hi_key, "curwin") == 0)
48284828
{
48294829
if (!(supported2 & JO2_CURWIN))
48304830
break;
48314831
opt->jo_set2 |= JO2_CURWIN;
4832-
opt->jo_curwin = get_tv_number(item);
4832+
opt->jo_curwin = tv_get_number(item);
48334833
}
48344834
else if (STRCMP(hi->hi_key, "hidden") == 0)
48354835
{
48364836
if (!(supported2 & JO2_HIDDEN))
48374837
break;
48384838
opt->jo_set2 |= JO2_HIDDEN;
4839-
opt->jo_hidden = get_tv_number(item);
4839+
opt->jo_hidden = tv_get_number(item);
48404840
}
48414841
else if (STRCMP(hi->hi_key, "norestore") == 0)
48424842
{
48434843
if (!(supported2 & JO2_NORESTORE))
48444844
break;
48454845
opt->jo_set2 |= JO2_NORESTORE;
4846-
opt->jo_term_norestore = get_tv_number(item);
4846+
opt->jo_term_norestore = tv_get_number(item);
48474847
}
48484848
else if (STRCMP(hi->hi_key, "term_kill") == 0)
48494849
{
48504850
if (!(supported2 & JO2_TERM_KILL))
48514851
break;
48524852
opt->jo_set2 |= JO2_TERM_KILL;
4853-
opt->jo_term_kill = get_tv_string_chk(item);
4853+
opt->jo_term_kill = tv_get_string_chk(item);
48544854
}
48554855
# if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
48564856
else if (STRCMP(hi->hi_key, "ansi_colors") == 0)
48574857
{
4858-
int n = 0;
4858+
int n = 0;
48594859
listitem_T *li;
48604860
long_u rgb[16];
48614861

@@ -4873,9 +4873,9 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
48734873
for (; li != NULL && n < 16; li = li->li_next, n++)
48744874
{
48754875
char_u *color_name;
4876-
guicolor_T guicolor;
4876+
guicolor_T guicolor;
48774877

4878-
color_name = get_tv_string_chk(&li->li_tv);
4878+
color_name = tv_get_string_chk(&li->li_tv);
48794879
if (color_name == NULL)
48804880
return FAIL;
48814881

@@ -4915,7 +4915,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
49154915
{
49164916
if (!(supported2 & JO2_CWD))
49174917
break;
4918-
opt->jo_cwd = get_tv_string_buf_chk(item, opt->jo_cwd_buf);
4918+
opt->jo_cwd = tv_get_string_buf_chk(item, opt->jo_cwd_buf);
49194919
if (opt->jo_cwd == NULL || !mch_isdir(opt->jo_cwd)
49204920
#ifndef WIN32 // Win32 directories don't have the concept of "executable"
49214921
|| mch_access((char *)opt->jo_cwd, X_OK) != 0
@@ -4932,35 +4932,35 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
49324932
if (!(supported & JO_WAITTIME))
49334933
break;
49344934
opt->jo_set |= JO_WAITTIME;
4935-
opt->jo_waittime = get_tv_number(item);
4935+
opt->jo_waittime = tv_get_number(item);
49364936
}
49374937
else if (STRCMP(hi->hi_key, "timeout") == 0)
49384938
{
49394939
if (!(supported & JO_TIMEOUT))
49404940
break;
49414941
opt->jo_set |= JO_TIMEOUT;
4942-
opt->jo_timeout = get_tv_number(item);
4942+
opt->jo_timeout = tv_get_number(item);
49434943
}
49444944
else if (STRCMP(hi->hi_key, "out_timeout") == 0)
49454945
{
49464946
if (!(supported & JO_OUT_TIMEOUT))
49474947
break;
49484948
opt->jo_set |= JO_OUT_TIMEOUT;
4949-
opt->jo_out_timeout = get_tv_number(item);
4949+
opt->jo_out_timeout = tv_get_number(item);
49504950
}
49514951
else if (STRCMP(hi->hi_key, "err_timeout") == 0)
49524952
{
49534953
if (!(supported & JO_ERR_TIMEOUT))
49544954
break;
49554955
opt->jo_set |= JO_ERR_TIMEOUT;
4956-
opt->jo_err_timeout = get_tv_number(item);
4956+
opt->jo_err_timeout = tv_get_number(item);
49574957
}
49584958
else if (STRCMP(hi->hi_key, "part") == 0)
49594959
{
49604960
if (!(supported & JO_PART))
49614961
break;
49624962
opt->jo_set |= JO_PART;
4963-
val = get_tv_string(item);
4963+
val = tv_get_string(item);
49644964
if (STRCMP(val, "err") == 0)
49654965
opt->jo_part = PART_ERR;
49664966
else if (STRCMP(val, "out") == 0)
@@ -4976,14 +4976,14 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
49764976
if (!(supported & JO_ID))
49774977
break;
49784978
opt->jo_set |= JO_ID;
4979-
opt->jo_id = get_tv_number(item);
4979+
opt->jo_id = tv_get_number(item);
49804980
}
49814981
else if (STRCMP(hi->hi_key, "stoponexit") == 0)
49824982
{
49834983
if (!(supported & JO_STOPONEXIT))
49844984
break;
49854985
opt->jo_set |= JO_STOPONEXIT;
4986-
opt->jo_stoponexit = get_tv_string_buf_chk(item,
4986+
opt->jo_stoponexit = tv_get_string_buf_chk(item,
49874987
opt->jo_soe_buf);
49884988
if (opt->jo_stoponexit == NULL)
49894989
{
@@ -4996,7 +4996,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
49964996
if (!(supported & JO_BLOCK_WRITE))
49974997
break;
49984998
opt->jo_set |= JO_BLOCK_WRITE;
4999-
opt->jo_block_write = get_tv_number(item);
4999+
opt->jo_block_write = tv_get_number(item);
50005000
}
50015001
else
50025002
break;
@@ -5035,7 +5035,7 @@ get_channel_arg(typval_T *tv, int check_open, int reading, ch_part_T part)
50355035
}
50365036
else
50375037
{
5038-
EMSG2(_(e_invarg2), get_tv_string(tv));
5038+
EMSG2(_(e_invarg2), tv_get_string(tv));
50395039
return NULL;
50405040
}
50415041
if (channel != NULL && reading)
@@ -5262,7 +5262,7 @@ win32_build_cmd(list_T *l, garray_T *gap)
52625262

52635263
for (li = l->lv_first; li != NULL; li = li->li_next)
52645264
{
5265-
s = get_tv_string_chk(&li->li_tv);
5265+
s = tv_get_string_chk(&li->li_tv);
52665266
if (s == NULL)
52675267
return FAIL;
52685268
s = win32_escape_arg(s);
@@ -5832,7 +5832,7 @@ job_stop(job_T *job, typval_T *argvars, char *type)
58325832
arg = (char_u *)"";
58335833
else
58345834
{
5835-
arg = get_tv_string_chk(&argvars[1]);
5835+
arg = tv_get_string_chk(&argvars[1]);
58365836
if (arg == NULL)
58375837
{
58385838
EMSG(_(e_invarg));

‎src/dict.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ dict_get_string(dict_T *d, char_u *key, int save)
495495
di = dict_find(d, key, -1);
496496
if (di == NULL)
497497
return NULL;
498-
s = get_tv_string(&di->di_tv);
498+
s = tv_get_string(&di->di_tv);
499499
if (save && s != NULL)
500500
s = vim_strsave(s);
501501
return s;
@@ -513,7 +513,7 @@ dict_get_number(dict_T *d, char_u *key)
513513
di = dict_find(d, key, -1);
514514
if (di == NULL)
515515
return 0;
516-
return get_tv_number(&di->di_tv);
516+
return tv_get_number(&di->di_tv);
517517
}
518518

519519
/*
@@ -630,10 +630,10 @@ dict_get_tv(char_u **arg, typval_T *rettv, int evaluate)
630630
}
631631
if (evaluate)
632632
{
633-
key = get_tv_string_buf_chk(&tvkey, buf);
633+
key = tv_get_string_buf_chk(&tvkey, buf);
634634
if (key == NULL)
635635
{
636-
/* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
636+
/* "key" is NULL when tv_get_string_buf_chk() gave an errmsg */
637637
clear_tv(&tvkey);
638638
goto failret;
639639
}

‎src/edit.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4363,7 +4363,7 @@ ins_compl_add_tv(typval_T *tv, int dir)
43634363
}
43644364
else
43654365
{
4366-
word = get_tv_string_chk(tv);
4366+
word = tv_get_string_chk(tv);
43674367
vim_memset(cptext, 0, sizeof(cptext));
43684368
}
43694369
if (word == NULL || (!aempty && *word == NUL))

0 commit comments

Comments
 (0)