Mercurial > vim
changeset 36399:71ec10757d8e draft v9.1.0818
patch 9.1.0818: some global functions are only used in single files
Commit: https://github.com/vim/vim/commit/a04003a929e443813c8060242e9809135b134a4c
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Sun Oct 27 21:54:11 2024 +0100
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 27 Oct 2024 22:15:03 +0100 |
| parents | cdc1a8869b0e |
| children | cc3764b0682d |
| files | src/misc1.c src/proto/misc1.pro src/proto/typval.pro src/proto/userfunc.pro src/proto/vim9class.pro src/typval.c src/userfunc.c src/version.c src/vim9class.c |
| diffstat | 9 files changed, 17 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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 : */
--- a/src/proto/typval.pro +++ b/src/proto/typval.pro @@ -53,7 +53,6 @@ int check_for_list_or_dict_or_blob_arg(t 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);
--- a/src/proto/userfunc.pro +++ b/src/proto/userfunc.pro @@ -42,7 +42,6 @@ int call_func(char_u *funcname, int len, 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);
--- a/src/proto/vim9class.pro +++ b/src/proto/vim9class.pro @@ -7,7 +7,6 @@ void enum_set_internal_obj_vars(class_T 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);
--- a/src/typval.c +++ b/src/typval.c @@ -1021,7 +1021,7 @@ check_for_object_arg(typval_T *args, int /* * 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 &&
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -34,6 +34,7 @@ static void func_clear(ufunc_T *fp, int 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,