patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string()
Problem: Using illogical name for get_dict_number()/get_dict_string().
Solution: Rename to start with dict_.
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 6e68755..93cac5a 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -8072,7 +8072,7 @@
}
if (dict_find(tv->vval.v_dict, (char_u *)"conceal", -1) != NULL)
- *conceal_char = get_dict_string(tv->vval.v_dict,
+ *conceal_char = dict_get_string(tv->vval.v_dict,
(char_u *)"conceal", FALSE);
if ((di = dict_find(tv->vval.v_dict, (char_u *)"window", -1)) != NULL)
@@ -10668,7 +10668,7 @@
if ((d = argvars[0].vval.v_dict) != NULL)
{
- csearch = get_dict_string(d, (char_u *)"char", FALSE);
+ csearch = dict_get_string(d, (char_u *)"char", FALSE);
if (csearch != NULL)
{
#ifdef FEAT_MBYTE
@@ -10922,16 +10922,16 @@
}
}
- group = get_dict_string(d, (char_u *)"group", TRUE);
- priority = (int)get_dict_number(d, (char_u *)"priority");
- id = (int)get_dict_number(d, (char_u *)"id");
+ group = dict_get_string(d, (char_u *)"group", TRUE);
+ priority = (int)dict_get_number(d, (char_u *)"priority");
+ id = (int)dict_get_number(d, (char_u *)"id");
conceal = dict_find(d, (char_u *)"conceal", -1) != NULL
- ? get_dict_string(d, (char_u *)"conceal", TRUE)
+ ? dict_get_string(d, (char_u *)"conceal", TRUE)
: NULL;
if (i == 0)
{
match_add(curwin, group,
- get_dict_string(d, (char_u *)"pattern", FALSE),
+ dict_get_string(d, (char_u *)"pattern", FALSE),
priority, id, NULL, conceal);
}
else
@@ -13529,7 +13529,7 @@
return;
}
if (dict_find(dict, (char_u *)"repeat", -1) != NULL)
- repeat = get_dict_number(dict, (char_u *)"repeat");
+ repeat = dict_get_number(dict, (char_u *)"repeat");
}
callback = get_callback(&argvars[1], &partial);
@@ -14080,29 +14080,29 @@
else
{
if (dict_find(dict, (char_u *)"lnum", -1) != NULL)
- curwin->w_cursor.lnum = (linenr_T)get_dict_number(dict, (char_u *)"lnum");
+ curwin->w_cursor.lnum = (linenr_T)dict_get_number(dict, (char_u *)"lnum");
if (dict_find(dict, (char_u *)"col", -1) != NULL)
- curwin->w_cursor.col = (colnr_T)get_dict_number(dict, (char_u *)"col");
+ curwin->w_cursor.col = (colnr_T)dict_get_number(dict, (char_u *)"col");
#ifdef FEAT_VIRTUALEDIT
if (dict_find(dict, (char_u *)"coladd", -1) != NULL)
- curwin->w_cursor.coladd = (colnr_T)get_dict_number(dict, (char_u *)"coladd");
+ curwin->w_cursor.coladd = (colnr_T)dict_get_number(dict, (char_u *)"coladd");
#endif
if (dict_find(dict, (char_u *)"curswant", -1) != NULL)
{
- curwin->w_curswant = (colnr_T)get_dict_number(dict, (char_u *)"curswant");
+ curwin->w_curswant = (colnr_T)dict_get_number(dict, (char_u *)"curswant");
curwin->w_set_curswant = FALSE;
}
if (dict_find(dict, (char_u *)"topline", -1) != NULL)
- set_topline(curwin, (linenr_T)get_dict_number(dict, (char_u *)"topline"));
+ set_topline(curwin, (linenr_T)dict_get_number(dict, (char_u *)"topline"));
#ifdef FEAT_DIFF
if (dict_find(dict, (char_u *)"topfill", -1) != NULL)
- curwin->w_topfill = (int)get_dict_number(dict, (char_u *)"topfill");
+ curwin->w_topfill = (int)dict_get_number(dict, (char_u *)"topfill");
#endif
if (dict_find(dict, (char_u *)"leftcol", -1) != NULL)
- curwin->w_leftcol = (colnr_T)get_dict_number(dict, (char_u *)"leftcol");
+ curwin->w_leftcol = (colnr_T)dict_get_number(dict, (char_u *)"leftcol");
if (dict_find(dict, (char_u *)"skipcol", -1) != NULL)
- curwin->w_skipcol = (colnr_T)get_dict_number(dict, (char_u *)"skipcol");
+ curwin->w_skipcol = (colnr_T)dict_get_number(dict, (char_u *)"skipcol");
check_cursor();
win_new_height(curwin, curwin->w_height);