patch 9.1.1781: some functions could be defined static
Commit:
https://github.com/vim/vim/commit/3a6cf6d53b0ecf84ae4a0f8073996b34117251db
Author: Yegappan Lakshmanan <[email protected]>
Date: Sun Sep 21 17:52:42 2025 +0000
patch 9.1.1781: some functions could be defined static
Problem: some functions could be defined static
Solution: Change function definitions and make them static
(Yegappan Lakshmanan)
closes: #18354
Signed-off-by: Yegappan Lakshmanan <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/eval.c b/src/eval.c
index 9e6dc7444..9895f1069 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -22,6 +22,7 @@
#define NAMESPACE_CHAR (char_u *)"abglstvw"
+static int eval0_simple_funccal(char_u *arg, typval_T *rettv, exarg_T *eap,
evalarg_T *evalarg);
static int eval2(char_u **arg, typval_T *rettv, evalarg_T *evalarg);
static int eval3(char_u **arg, typval_T *rettv, evalarg_T *evalarg);
static int eval4(char_u **arg, typval_T *rettv, evalarg_T *evalarg);
diff --git a/src/insexpand.c b/src/insexpand.c
index bb814af70..cd366febb 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -1057,6 +1057,15 @@ ins_compl_insert_bytes(char_u *p, int len)
compl_ins_end_col = curwin->w_cursor.col;
}
+/*
+ * Get current completion leader length
+ */
+ static size_t
+ins_compl_leader_len(void)
+{
+ return compl_leader.string != NULL ? compl_leader.length :
compl_orig_text.length;
+}
+
/*
* Checks if the column is within the currently inserted completion text
* column range. If it is, it returns a special highlight attribute.
@@ -1836,15 +1845,6 @@ ins_compl_leader(void)
return compl_leader.string != NULL ? compl_leader.string :
compl_orig_text.string;
}
-/*
- * Get current completion leader length
- */
- size_t
-ins_compl_leader_len(void)
-{
- return compl_leader.string != NULL ? compl_leader.length :
compl_orig_text.length;
-}
-
/*
* Add any identifiers that match the given pattern "pat" in the list of
* dictionary files "dict_start" to the list of completions.
diff --git a/src/option.c b/src/option.c
index 4f74de514..7c5f4b99d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -60,6 +60,7 @@ static int put_setstring(FILE *fd, char *cmd, char *name,
char_u **valuep, long_
static int put_setnum(FILE *fd, char *cmd, char *name, long *valuep);
static int put_setbool(FILE *fd, char *cmd, char *name, int value);
static int istermoption(struct vimoption *p);
+static int istermoption_idx(int opt_idx);
static char_u *get_varp_scope(struct vimoption *p, int scope);
static char_u *get_varp(struct vimoption *);
static void check_win_options(win_T *win);
@@ -6410,7 +6411,7 @@ istermoption(struct vimoption *p)
/*
* Returns TRUE if the option at 'opt_idx' starts with 't_'
*/
- int
+ static int
istermoption_idx(int opt_idx)
{
return istermoption(&options[opt_idx]);
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 47be0b9a7..2a0312175 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -40,7 +40,6 @@ char_u *eval_next_line(char_u *arg, evalarg_T *evalarg);
char_u *skipwhite_and_linebreak(char_u *arg, evalarg_T *evalarg);
int eval0(char_u *arg, typval_T *rettv, exarg_T *eap, evalarg_T *evalarg);
int may_call_simple_func(char_u *arg, typval_T *rettv);
-int eval0_simple_funccal(char_u *arg, typval_T *rettv, exarg_T *eap, evalarg_T
*evalarg);
int eval0_retarg(char_u *arg, typval_T *rettv, exarg_T *eap, evalarg_T
*evalarg, char_u **retarg);
int eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg);
void eval_addblob(typval_T *tv1, typval_T *tv2);
diff --git a/src/proto/insexpand.pro b/src/proto/insexpand.pro
index 3dfa9c019..fcf64378c 100644
--- a/src/proto/insexpand.pro
+++ b/src/proto/insexpand.pro
@@ -34,7 +34,6 @@ unsigned int get_cot_flags(void);
int pum_wanted(void);
void ins_compl_show_pum(void);
char_u *ins_compl_leader(void);
-size_t ins_compl_leader_len(void);
char_u *find_word_start(char_u *ptr);
char_u *find_word_end(char_u *ptr);
char_u *find_line_end(char_u *ptr);
diff --git a/src/proto/option.pro b/src/proto/option.pro
index cae025d31..de551d83e 100644
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -117,7 +117,6 @@ void clear_termoptions(void);
void free_termoptions(void);
void free_one_termoption(char_u *var);
void set_term_defaults(void);
-int istermoption_idx(int opt_idx);
void unset_global_local_option(char_u *name, void *from);
char_u *get_option_varp_scope(int opt_idx, int scope);
char_u *get_option_var(int opt_idx);
diff --git a/src/proto/wayland.pro b/src/proto/wayland.pro
index 990bd0458..a1f327dbc 100644
--- a/src/proto/wayland.pro
+++ b/src/proto/wayland.pro
@@ -1,7 +1,6 @@
/* wayland.c */
int wayland_init_client(const char *display);
void wayland_uninit_client(void);
-int wayland_client_is_connected(int quiet);
int wayland_client_update(void);
int wayland_cb_init(const char *seat);
void wayland_cb_uninit(void);
diff --git a/src/version.c b/src/version.c
index 23fa184db..a27fe7cae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1781,
/**/
1780,
/**/
diff --git a/src/wayland.c b/src/wayland.c
index 050682894..5aa8ec17e 100644
--- a/src/wayland.c
+++ b/src/wayland.c
@@ -985,7 +985,7 @@ wayland_uninit_client(void)
/*
* Return TRUE if Wayland display connection is valid and ready.
*/
- int
+ static int
wayland_client_is_connected(int quiet)
{
if (vwl_display.proxy == NULL)
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1v0OM1-0030rG-UR%40256bit.org.
