patch 9.1.0818: some global functions are only used in single files

Problem:  some global functions are only used in single files
Solution: refactor code slightly and make some more functions static
          (Yegappan Lakshmanan)

closes: #15951

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/misc1.c b/src/misc1.c
index 0898efb33f6e955845210ecd834ab85328a05476..90cf914742b115a183d61b594009c7302b7aa0d5 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -953,6 +953,17 @@ get_keystroke(void)
     return n;
 }
 
+// For overflow detection, add a digit safely to an int value.
+    static int
+vim_append_digit_int(int *value, int digit)
+{
+    int x = *value;
+    if (x > ((INT_MAX - digit) / 10))
+       return FAIL;
+    *value = x * 10 + digit;
+    return OK;
+}
+
 /*
  * Get a number from the user.
  * When "mouse_used" is not NULL allow using the mouse.
@@ -2824,17 +2835,6 @@ may_trigger_modechanged(void)
 #endif
 }
 
-// For overflow detection, add a digit safely to an int value.
-    int
-vim_append_digit_int(int *value, int digit)
-{
-    int x = *value;
-    if (x > ((INT_MAX - digit) / 10))
-       return FAIL;
-    *value = x * 10 + digit;
-    return OK;
-}
-
 // For overflow detection, add a digit safely to a long value.
     int
 vim_append_digit_long(long *value, int digit)

diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
index d64f961f011db5d128c717d2440ba23a7fa062df..1a053e3dbcab0f81b8909a5d6b4d358c350345a8 100644 (file)
--- a/src/proto/misc1.pro
+++ b/src/proto/misc1.pro
@@ -53,7 +53,6 @@ int path_with_url(char_u *fname);
 dict_T *get_v_event(save_v_event_T *sve);
 void restore_v_event(dict_T *v_event, save_v_event_T *sve);
 void may_trigger_modechanged(void);
-int vim_append_digit_int(int *value, int digit);
 int vim_append_digit_long(long *value, int digit);
 int trim_to_int(vimlong_T x);
 /* vim: set ft=c : */

diff --git a/src/proto/typval.pro b/src/proto/typval.pro
index 1edfeb4c18073f747e2b46e7575ee4384b34b84a..b70618342f5132c535495f158b091bd43fe1a41c 100644 (file)
--- a/src/proto/typval.pro
+++ b/src/proto/typval.pro
@@ -53,7 +53,6 @@ int check_for_list_or_dict_or_blob_arg(typval_T *args, int idx);
 int check_for_list_or_dict_or_blob_or_string_arg(typval_T *args, int idx);
 int check_for_opt_buffer_or_dict_arg(typval_T *args, int idx);
 int check_for_object_arg(typval_T *args, int idx);
-int tv_class_alias(typval_T *tv);
 int check_for_class_or_typealias_args(typval_T *args, int idx);
 char_u *tv_get_string(typval_T *varp);
 char_u *tv_get_string_strict(typval_T *varp);

diff --git a/src/proto/userfunc.pro b/src/proto/userfunc.pro
index 32dac661b03a0a1f5e63c4fc3f1b5e4c5595f078..cdcf017d362c1aacd8690cb78d243c2055511d85 100644 (file)
--- a/src/proto/userfunc.pro
+++ b/src/proto/userfunc.pro
@@ -42,7 +42,6 @@ int call_func(char_u *funcname, int len, typval_T *rettv, int argcount_in, typva
 int call_simple_func(char_u *funcname, size_t len, typval_T *rettv);
 char_u *printable_func_name(ufunc_T *fp);
 char_u *trans_function_name(char_u **pp, int *is_global, int skip, int flags);
-char_u *trans_function_name_ext(char_u **pp, int *is_global, int skip, int flags, funcdict_T *fdp, partial_T **partial, type_T **type, ufunc_T **ufunc);
 char_u *get_scriptlocal_funcname(char_u *funcname);
 char_u *alloc_printable_func_name(char_u *fname);
 char_u *save_function_name(char_u **name, int *is_global, int skip, int flags, funcdict_T *fudi);

diff --git a/src/proto/vim9class.pro b/src/proto/vim9class.pro
index c87fffbc8ac3b8ec580bc237dd86a99f09cc39eb..7d11523cef200e3f797fda481503c9509553138c 100644 (file)
--- a/src/proto/vim9class.pro
+++ b/src/proto/vim9class.pro
@@ -7,7 +7,6 @@ void enum_set_internal_obj_vars(class_T *en, object_T *enval);
 type_T *oc_member_type(class_T *cl, int is_object, char_u *name, char_u *name_end, int *member_idx);
 type_T *oc_member_type_by_idx(class_T *cl, int is_object, int member_idx);
 void ex_enum(exarg_T *eap);
-void typealias_free(typealias_T *ta);
 void typealias_unref(typealias_T *ta);
 void ex_type(exarg_T *eap);
 int class_object_index(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int verbose);

diff --git a/src/typval.c b/src/typval.c
index 01ffef5e5d896b407117424fc2f98d27b0b7f432..e57d8981503ce90a9e38c0bd89d8f9eb3b1dffaf 100644 (file)
--- a/src/typval.c
+++ b/src/typval.c
@@ -1021,7 +1021,7 @@ check_for_object_arg(typval_T *args, int idx)
 /*
  * Returns TRUE if "tv" is a type alias for a class
  */
-    int
+    static int
 tv_class_alias(typval_T *tv)
 {
     return tv->v_type == VAR_TYPEALIAS &&

diff --git a/src/userfunc.c b/src/userfunc.c
index 5d167101d850b94372fba773df28bc0d1b4ea246..5bf7e9558ed4d2f61c0721d75f6efa6549229bd5 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -34,6 +34,7 @@ static void func_clear(ufunc_T *fp, int force);
 static int func_free(ufunc_T *fp, int force);
 static char_u *untrans_function_name(char_u *name);
 static void handle_defer_one(funccall_T *funccal);
+static char_u *trans_function_name_ext(char_u **pp, int *is_global, int skip, int flags, funcdict_T *fdp, partial_T **partial, type_T **type, ufunc_T **ufunc);
 
     void
 func_init(void)
@@ -4266,7 +4267,7 @@ trans_function_name(
  * trans_function_name() with extra arguments.
  * "fdp", "partial", "type" and "ufunc" can be NULL.
  */
-    char_u *
+    static char_u *
 trans_function_name_ext(
     char_u     **pp,
     int                *is_global,

diff --git a/src/version.c b/src/version.c
index 90fc3b3e00c4fcc1d6602d657bf267ddbaf8948f..02e24d5529ce3859cb5e1c03a4b1e0e6288e529c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    818,
 /**/
     817,
 /**/

diff --git a/src/vim9class.c b/src/vim9class.c
index d8813c6f20f78529e202fb7ec25b9d34601ebaa4..87b4d45ea5744a95568597d3667464fb35f0e182 100644 (file)
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -2646,7 +2646,7 @@ oc_member_type_by_idx(
  * Type aliases (:type)
  */
 
-    void
+    static void
 typealias_free(typealias_T *ta)
 {
     // ta->ta_type is freed in clear_type_list()