To: vim_dev@googlegroups.com Subject: Patch 8.2.0514 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0514 Problem: Several global functions are used in only one file. Solution: Make the functions static. (Yegappan Lakshmanan, closes #5884) Files: src/drawscreen.c, src/evalvars.c, src/getchar.c, src/list.c, src/proto/drawscreen.pro, src/proto/evalvars.pro, src/proto/getchar.pro, src/proto/list.pro, src/proto/version.pro, src/version.c *** ../vim-8.2.0513/src/drawscreen.c 2020-02-28 22:19:38.314023342 +0100 --- src/drawscreen.c 2020-04-05 18:53:35.153959180 +0200 *************** *** 73,78 **** --- 73,80 ---- static int did_update_one_window; #endif + static void win_redr_status(win_T *wp, int ignore_pum); + /* * Based on the current value of curwin->w_topline, transfer a screenfull * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. *************** *** 382,388 **** * If "ignore_pum" is TRUE, also redraw statusline when the popup menu is * displayed. */ ! void win_redr_status(win_T *wp, int ignore_pum UNUSED) { int row; --- 384,390 ---- * If "ignore_pum" is TRUE, also redraw statusline when the popup menu is * displayed. */ ! static void win_redr_status(win_T *wp, int ignore_pum UNUSED) { int row; *** ../vim-8.2.0513/src/evalvars.c 2020-04-03 18:43:31.886980756 +0200 --- src/evalvars.c 2020-04-05 18:53:35.153959180 +0200 *************** *** 2435,2441 **** /* * Get the script-local hashtab. NULL if not in a script context. */ ! hashtab_T * get_script_local_ht(void) { scid_T sid = current_sctx.sc_sid; --- 2435,2441 ---- /* * Get the script-local hashtab. NULL if not in a script context. */ ! static hashtab_T * get_script_local_ht(void) { scid_T sid = current_sctx.sc_sid; *** ../vim-8.2.0513/src/getchar.c 2020-03-11 13:01:36.025436785 +0100 --- src/getchar.c 2020-04-05 18:53:35.153959180 +0200 *************** *** 99,105 **** /* * Free and clear a buffer. */ ! void free_buff(buffheader_T *buf) { buffblock_T *p, *np; --- 99,105 ---- /* * Free and clear a buffer. */ ! static void free_buff(buffheader_T *buf) { buffblock_T *p, *np; *** ../vim-8.2.0513/src/list.c 2020-04-02 18:50:42.423773112 +0200 --- src/list.c 2020-04-05 18:53:35.153959180 +0200 *************** *** 20,25 **** --- 20,27 ---- // List heads for garbage collection. static list_T *first_list = NULL; // list of all lists + static void list_free_item(list_T *l, listitem_T *item); + /* * Add a watcher to a list. */ *************** *** 311,317 **** * Free a list item, unless it was allocated together with the list itself. * Does not clear the value. Does not notify watchers. */ ! void list_free_item(list_T *l, listitem_T *item) { if (l->lv_with_items == 0 || item < (listitem_T *)l --- 313,319 ---- * Free a list item, unless it was allocated together with the list itself. * Does not clear the value. Does not notify watchers. */ ! static void list_free_item(list_T *l, listitem_T *item) { if (l->lv_with_items == 0 || item < (listitem_T *)l *************** *** 1225,1231 **** rettv->vval.v_string = ga.ga_data; } ! void list_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg) { list_T *l; --- 1227,1233 ---- rettv->vval.v_string = ga.ga_data; } ! static void list_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg) { list_T *l; *** ../vim-8.2.0513/src/proto/drawscreen.pro 2019-12-12 12:55:18.000000000 +0100 --- src/proto/drawscreen.pro 2020-04-05 18:53:35.153959180 +0200 *************** *** 1,6 **** /* drawscreen.c */ int update_screen(int type_arg); - void win_redr_status(win_T *wp, int ignore_pum); void showruler(int always); void win_redr_ruler(win_T *wp, int always, int ignore_pum); void after_updating_screen(int may_resize_shell); --- 1,5 ---- *** ../vim-8.2.0513/src/proto/evalvars.pro 2020-02-02 22:24:00.624827188 +0100 --- src/proto/evalvars.pro 2020-04-05 18:53:35.153959180 +0200 *************** *** 54,60 **** void check_vars(char_u *name, int len); dictitem_T *find_var(char_u *name, hashtab_T **htp, int no_autoload); dictitem_T *find_var_in_ht(hashtab_T *ht, int htname, char_u *varname, int no_autoload); - hashtab_T *get_script_local_ht(void); int lookup_scriptvar(char_u *name, size_t len, cctx_T *dummy); hashtab_T *find_var_ht(char_u *name, char_u **varname); char_u *get_var_value(char_u *name); --- 54,59 ---- *** ../vim-8.2.0513/src/proto/getchar.pro 2019-12-12 12:55:22.000000000 +0100 --- src/proto/getchar.pro 2020-04-05 18:53:35.153959180 +0200 *************** *** 1,5 **** /* getchar.c */ - void free_buff(buffheader_T *buf); char_u *get_recorded(void); char_u *get_inserted(void); int stuff_empty(void); --- 1,4 ---- *** ../vim-8.2.0513/src/proto/list.pro 2020-01-26 15:52:33.023833239 +0100 --- src/proto/list.pro 2020-04-05 18:53:35.153959180 +0200 *************** *** 13,19 **** void list_free_items(int copyID); void list_free(list_T *l); listitem_T *listitem_alloc(void); - void list_free_item(list_T *l, listitem_T *item); void listitem_free(list_T *l, listitem_T *item); void listitem_remove(list_T *l, listitem_T *item); long list_len(list_T *l); --- 13,18 ---- *************** *** 42,48 **** int write_list(FILE *fd, list_T *list, int binary); void init_static_list(staticList10_T *sl); void f_list2str(typval_T *argvars, typval_T *rettv); - void list_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg); void f_sort(typval_T *argvars, typval_T *rettv); void f_uniq(typval_T *argvars, typval_T *rettv); void f_filter(typval_T *argvars, typval_T *rettv); --- 41,46 ---- *** ../vim-8.2.0513/src/proto/version.pro 2019-12-12 12:55:37.000000000 +0100 --- src/proto/version.pro 2020-04-05 18:53:35.153959180 +0200 *************** *** 6,11 **** void list_in_columns(char_u **items, int size, int current); void list_version(void); void maybe_intro_message(void); - void intro_message(int colon); void ex_intro(exarg_T *eap); /* vim: set ft=c : */ --- 6,10 ---- *** ../vim-8.2.0513/src/version.c 2020-04-05 18:20:41.432605075 +0200 --- src/version.c 2020-04-05 18:54:13.617824074 +0200 *************** *** 2234,2239 **** --- 2236,2242 ---- } static void do_intro_line(int row, char_u *mesg, int add_version, int attr); + static void intro_message(int colon); /* * Show the intro message when not editing a file. *************** *** 2253,2259 **** * Only used when starting Vim on an empty file, without a file name. * Or with the ":intro" command (for Sven :-). */ ! void intro_message( int colon) // TRUE for ":intro" { --- 2256,2262 ---- * Only used when starting Vim on an empty file, without a file name. * Or with the ":intro" command (for Sven :-). */ ! static void intro_message( int colon) // TRUE for ":intro" { *** ../vim-8.2.0513/src/version.c 2020-04-05 18:20:41.432605075 +0200 --- src/version.c 2020-04-05 18:54:13.617824074 +0200 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 514, /**/ -- It is illegal for a driver to be blindfolded while operating a vehicle. [real standing law in Alabama, United States of America] /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///