0
0
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00

patch 8.1.2021: some global functions can be local to the file

Problem:    Some global functions can be local to the file.
Solution:   Add "static". (Yegappan Lakshmanan, closes #4917)
This commit is contained in:
Bram Moolenaar 2019-09-10 21:27:18 +02:00
parent d20dcb3d01
commit 840d16fd36
18 changed files with 17 additions and 26 deletions

View File

@ -260,7 +260,7 @@ check_due_timer(void)
/* /*
* Find a timer by ID. Returns NULL if not found; * Find a timer by ID. Returns NULL if not found;
*/ */
timer_T * static timer_T *
find_timer(long id) find_timer(long id)
{ {
timer_T *timer; timer_T *timer;
@ -291,7 +291,7 @@ stop_timer(timer_T *timer)
} }
} }
void static void
stop_all_timers(void) stop_all_timers(void)
{ {
timer_T *timer; timer_T *timer;
@ -304,7 +304,7 @@ stop_all_timers(void)
} }
} }
void static void
add_timer_info(typval_T *rettv, timer_T *timer) add_timer_info(typval_T *rettv, timer_T *timer)
{ {
list_T *list = rettv->vval.v_list; list_T *list = rettv->vval.v_list;
@ -338,7 +338,7 @@ add_timer_info(typval_T *rettv, timer_T *timer)
} }
} }
void static void
add_timer_info_all(typval_T *rettv) add_timer_info_all(typval_T *rettv)
{ {
timer_T *timer; timer_T *timer;

View File

@ -793,7 +793,7 @@ f_filewritable(typval_T *argvars, typval_T *rettv)
rettv->vval.v_number = filewritable(tv_get_string(&argvars[0])); rettv->vval.v_number = filewritable(tv_get_string(&argvars[0]));
} }
void static void
findfilendir( findfilendir(
typval_T *argvars UNUSED, typval_T *argvars UNUSED,
typval_T *rettv, typval_T *rettv,

View File

@ -809,7 +809,7 @@ hangul_input_process(char_u *s, int len)
return len; return len;
} }
void static void
hangul_input_clear(void) hangul_input_clear(void)
{ {
sp = 0; sp = 0;

View File

@ -144,6 +144,7 @@ static int utf_ptr2cells_len(char_u *p, int size);
static int dbcs_char2cells(int c); static int dbcs_char2cells(int c);
static int dbcs_ptr2cells_len(char_u *p, int size); static int dbcs_ptr2cells_len(char_u *p, int size);
static int dbcs_ptr2char(char_u *p); static int dbcs_ptr2char(char_u *p);
static int dbcs_head_off(char_u *base, char_u *p);
/* /*
* Lookup table to quickly get the length in bytes of a UTF-8 character from * Lookup table to quickly get the length in bytes of a UTF-8 character from
@ -3778,7 +3779,7 @@ latin_head_off(char_u *base UNUSED, char_u *p UNUSED)
return 0; return 0;
} }
int static int
dbcs_head_off(char_u *base, char_u *p) dbcs_head_off(char_u *base, char_u *p)
{ {
char_u *q; char_u *q;

View File

@ -2761,7 +2761,7 @@ done:
# if defined(FEAT_EVAL) || defined(PROTO) # if defined(FEAT_EVAL) || defined(PROTO)
void static void
get_cmd_output_as_rettv( get_cmd_output_as_rettv(
typval_T *argvars, typval_T *argvars,
typval_T *rettv, typval_T *rettv,

View File

@ -4276,7 +4276,7 @@ open_pty(int *pty_master_fd, int *pty_slave_fd, char_u **name1, char_u **name2)
/* /*
* Send SIGINT to a child process if "c" is an interrupt character. * Send SIGINT to a child process if "c" is an interrupt character.
*/ */
void static void
may_send_sigint(int c UNUSED, pid_t pid UNUSED, pid_t wpid UNUSED) may_send_sigint(int c UNUSED, pid_t pid UNUSED, pid_t wpid UNUSED)
{ {
# ifdef SIGINT # ifdef SIGINT

View File

@ -2,11 +2,7 @@
long proftime_time_left(proftime_T *due, proftime_T *now); long proftime_time_left(proftime_T *due, proftime_T *now);
timer_T *create_timer(long msec, int repeat); timer_T *create_timer(long msec, int repeat);
long check_due_timer(void); long check_due_timer(void);
timer_T *find_timer(long id);
void stop_timer(timer_T *timer); void stop_timer(timer_T *timer);
void stop_all_timers(void);
void add_timer_info(typval_T *rettv, timer_T *timer);
void add_timer_info_all(typval_T *rettv);
int set_ref_in_timer(int copyID); int set_ref_in_timer(int copyID);
void timer_free_all(void); void timer_free_all(void);
void f_timer_info(typval_T *argvars, typval_T *rettv); void f_timer_info(typval_T *argvars, typval_T *rettv);

View File

@ -6,7 +6,6 @@ void f_executable(typval_T *argvars, typval_T *rettv);
void f_exepath(typval_T *argvars, typval_T *rettv); void f_exepath(typval_T *argvars, typval_T *rettv);
void f_filereadable(typval_T *argvars, typval_T *rettv); void f_filereadable(typval_T *argvars, typval_T *rettv);
void f_filewritable(typval_T *argvars, typval_T *rettv); void f_filewritable(typval_T *argvars, typval_T *rettv);
void findfilendir(typval_T *argvars, typval_T *rettv, int find_what);
void f_finddir(typval_T *argvars, typval_T *rettv); void f_finddir(typval_T *argvars, typval_T *rettv);
void f_findfile(typval_T *argvars, typval_T *rettv); void f_findfile(typval_T *argvars, typval_T *rettv);
void f_fnamemodify(typval_T *argvars, typval_T *rettv); void f_fnamemodify(typval_T *argvars, typval_T *rettv);

View File

@ -5,7 +5,6 @@ int im_get_status(void);
void hangul_input_state_toggle(void); void hangul_input_state_toggle(void);
void hangul_keyboard_set(void); void hangul_keyboard_set(void);
int hangul_input_process(char_u *s, int len); int hangul_input_process(char_u *s, int len);
void hangul_input_clear(void);
char_u *hangul_string_convert(char_u *buf, int *p_len); char_u *hangul_string_convert(char_u *buf, int *p_len);
char_u *hangul_composing_buffer_get(int *p_len); char_u *hangul_composing_buffer_get(int *p_len);
/* vim: set ft=c : */ /* vim: set ft=c : */

View File

@ -50,7 +50,6 @@ int utf_isupper(int a);
int mb_strnicmp(char_u *s1, char_u *s2, size_t nn); int mb_strnicmp(char_u *s1, char_u *s2, size_t nn);
void show_utf8(void); void show_utf8(void);
int latin_head_off(char_u *base, char_u *p); int latin_head_off(char_u *base, char_u *p);
int dbcs_head_off(char_u *base, char_u *p);
int dbcs_screen_head_off(char_u *base, char_u *p); int dbcs_screen_head_off(char_u *base, char_u *p);
int utf_head_off(char_u *base, char_u *p); int utf_head_off(char_u *base, char_u *p);
void mb_copy_char(char_u **fp, char_u **tp); void mb_copy_char(char_u **fp, char_u **tp);

View File

@ -48,7 +48,6 @@ void preserve_exit(void);
void line_breakcheck(void); void line_breakcheck(void);
void fast_breakcheck(void); void fast_breakcheck(void);
char_u *get_cmd_output(char_u *cmd, char_u *infile, int flags, int *ret_len); char_u *get_cmd_output(char_u *cmd, char_u *infile, int flags, int *ret_len);
void get_cmd_output_as_rettv(typval_T *argvars, typval_T *rettv, int retlist);
void f_system(typval_T *argvars, typval_T *rettv); void f_system(typval_T *argvars, typval_T *rettv);
void f_systemlist(typval_T *argvars, typval_T *rettv); void f_systemlist(typval_T *argvars, typval_T *rettv);
int goto_im(void); int goto_im(void);

View File

@ -59,7 +59,6 @@ int mch_get_shellsize(void);
int mch_report_winsize(int fd, int rows, int cols); int mch_report_winsize(int fd, int rows, int cols);
void mch_set_shellsize(void); void mch_set_shellsize(void);
void mch_new_shellsize(void); void mch_new_shellsize(void);
void may_send_sigint(int c, pid_t pid, pid_t wpid);
int mch_call_shell(char_u *cmd, int options); int mch_call_shell(char_u *cmd, int options);
void mch_job_start(char **argv, job_T *job, jobopt_T *options, int is_terminal); void mch_job_start(char **argv, job_T *job, jobopt_T *options, int is_terminal);
char *mch_job_status(job_T *job); char *mch_job_status(job_T *job);

View File

@ -56,7 +56,6 @@ void f_term_start(typval_T *argvars, typval_T *rettv);
void f_term_wait(typval_T *argvars, typval_T *rettv); void f_term_wait(typval_T *argvars, typval_T *rettv);
void term_send_eof(channel_T *ch); void term_send_eof(channel_T *ch);
job_T *term_getjob(term_T *term); job_T *term_getjob(term_T *term);
void term_free_conpty(term_T *term);
int use_conpty(void); int use_conpty(void);
int terminal_enabled(void); int terminal_enabled(void);
/* vim: set ft=c : */ /* vim: set ft=c : */

View File

@ -7,7 +7,6 @@ int u_savedel(linenr_T lnum, long nlines);
int undo_allowed(void); int undo_allowed(void);
int u_savecommon(linenr_T top, linenr_T bot, linenr_T newbot, int reload); int u_savecommon(linenr_T top, linenr_T bot, linenr_T newbot, int reload);
void u_compute_hash(char_u *hash); void u_compute_hash(char_u *hash);
char_u *u_get_undo_file_name(char_u *buf_ffname, int reading);
void u_write_undo(char_u *name, int forceit, buf_T *buf, char_u *hash); void u_write_undo(char_u *name, int forceit, buf_T *buf, char_u *hash);
void u_read_undo(char_u *name, char_u *hash, char_u *orig_name); void u_read_undo(char_u *name, char_u *hash, char_u *orig_name);
void u_undo(int count); void u_undo(int count);
@ -27,7 +26,6 @@ int bufIsChanged(buf_T *buf);
int anyBufIsChanged(void); int anyBufIsChanged(void);
int bufIsChangedNotTerm(buf_T *buf); int bufIsChangedNotTerm(buf_T *buf);
int curbufIsChanged(void); int curbufIsChanged(void);
void u_eval_tree(u_header_T *first_uhp, list_T *list);
void f_undofile(typval_T *argvars, typval_T *rettv); void f_undofile(typval_T *argvars, typval_T *rettv);
void f_undotree(typval_T *argvars, typval_T *rettv); void f_undotree(typval_T *argvars, typval_T *rettv);
/* vim: set ft=c : */ /* vim: set ft=c : */

View File

@ -347,7 +347,7 @@ mch_openpty(char **ttyn)
#define PTY_DONE #define PTY_DONE
#ifdef _IBMR2 #ifdef _IBMR2
int aixhack = -1; static int aixhack = -1;
#endif #endif
int int

View File

@ -875,7 +875,7 @@ free_scrollback(term_T *term)
// Terminals that need to be freed soon. // Terminals that need to be freed soon.
term_T *terminals_to_free = NULL; static term_T *terminals_to_free = NULL;
/* /*
* Free a terminal and everything it refers to. * Free a terminal and everything it refers to.
@ -6024,7 +6024,7 @@ conpty_term_report_winsize(term_T *term, int rows, int cols)
pResizePseudoConsole(term->tl_conpty, consize); pResizePseudoConsole(term->tl_conpty, consize);
} }
void static void
term_free_conpty(term_T *term) term_free_conpty(term_T *term)
{ {
if (term->tl_siex.lpAttributeList != NULL) if (term->tl_siex.lpAttributeList != NULL)

View File

@ -775,7 +775,7 @@ u_compute_hash(char_u *hash)
* When "reading" is FALSE use the first name where the directory exists. * When "reading" is FALSE use the first name where the directory exists.
* Returns NULL when there is no place to write or no file to read. * Returns NULL when there is no place to write or no file to read.
*/ */
char_u * static char_u *
u_get_undo_file_name(char_u *buf_ffname, int reading) u_get_undo_file_name(char_u *buf_ffname, int reading)
{ {
char_u *dirp; char_u *dirp;
@ -3590,7 +3590,7 @@ curbufIsChanged(void)
* For undotree(): Append the list of undo blocks at "first_uhp" to "list". * For undotree(): Append the list of undo blocks at "first_uhp" to "list".
* Recursive. * Recursive.
*/ */
void static void
u_eval_tree(u_header_T *first_uhp, list_T *list) u_eval_tree(u_header_T *first_uhp, list_T *list)
{ {
u_header_T *uhp = first_uhp; u_header_T *uhp = first_uhp;

View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2021,
/**/ /**/
2020, 2020,
/**/ /**/