Skip to content

Commit d25c16e

Browse files
brammoolbrammool
committed
patch 7.4.1197
Problem: Still using __ARGS. Solution: Remove __ARGS in several files. (script by Hirohito Higashi)
1 parent f28dbce commit d25c16e

File tree

14 files changed

+317
-315
lines changed

14 files changed

+317
-315
lines changed

‎src/ex_eval.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
#if defined(FEAT_EVAL) || defined(PROTO)
1717

18-
static void free_msglist __ARGS((struct msglist *l));
19-
static int throw_exception __ARGS((void *, int, char_u *));
20-
static char_u *get_end_emsg __ARGS((struct condstack *cstack));
18+
static void free_msglist(struct msglist *l);
19+
static int throw_exception(void *, int, char_u *);
20+
static char_u *get_end_emsg(struct condstack *cstack);
2121

2222
/*
2323
* Exception handling terms:
@@ -65,10 +65,10 @@ static char_u *get_end_emsg __ARGS((struct condstack *cstack));
6565
# define THROW_ON_INTERRUPT_TRUE
6666
#endif
6767

68-
static void catch_exception __ARGS((except_T *excp));
69-
static void finish_exception __ARGS((except_T *excp));
70-
static void discard_exception __ARGS((except_T *excp, int was_finished));
71-
static void report_pending __ARGS((int action, int pending, void *value));
68+
static void catch_exception(except_T *excp);
69+
static void finish_exception(except_T *excp);
70+
static void discard_exception(except_T *excp, int was_finished);
71+
static void report_pending(int action, int pending, void *value);
7272

7373
/*
7474
* When several errors appear in a row, setting "force_abort" is delayed until

‎src/ex_getln.c‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ static int hisnum[HIST_COUNT] = {0, 0, 0, 0, 0};
6666
/* identifying (unique) number of newest history entry */
6767
static int hislen = 0; /* actual length of history tables */
6868

69-
static int hist_char2type __ARGS((int c));
69+
static int hist_char2type(int c);
7070

71-
static int in_history __ARGS((int, char_u *, int, int, int));
71+
static int in_history(int, char_u *, int, int, int);
7272
# ifdef FEAT_EVAL
73-
static int calc_hist_idx __ARGS((int histype, int num));
73+
static int calc_hist_idx(int histype, int num);
7474
# endif
7575
#endif
7676

@@ -82,58 +82,58 @@ static int cmd_hkmap = 0; /* Hebrew mapping during command line */
8282
static int cmd_fkmap = 0; /* Farsi mapping during command line */
8383
#endif
8484

85-
static int cmdline_charsize __ARGS((int idx));
86-
static void set_cmdspos __ARGS((void));
87-
static void set_cmdspos_cursor __ARGS((void));
85+
static int cmdline_charsize(int idx);
86+
static void set_cmdspos(void);
87+
static void set_cmdspos_cursor(void);
8888
#ifdef FEAT_MBYTE
89-
static void correct_cmdspos __ARGS((int idx, int cells));
90-
#endif
91-
static void alloc_cmdbuff __ARGS((int len));
92-
static int realloc_cmdbuff __ARGS((int len));
93-
static void draw_cmdline __ARGS((int start, int len));
94-
static void save_cmdline __ARGS((struct cmdline_info *ccp));
95-
static void restore_cmdline __ARGS((struct cmdline_info *ccp));
96-
static int cmdline_paste __ARGS((int regname, int literally, int remcr));
89+
static void correct_cmdspos(int idx, int cells);
90+
#endif
91+
static void alloc_cmdbuff(int len);
92+
static int realloc_cmdbuff(int len);
93+
static void draw_cmdline(int start, int len);
94+
static void save_cmdline(struct cmdline_info *ccp);
95+
static void restore_cmdline(struct cmdline_info *ccp);
96+
static int cmdline_paste(int regname, int literally, int remcr);
9797
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
98-
static void redrawcmd_preedit __ARGS((void));
98+
static void redrawcmd_preedit(void);
9999
#endif
100100
#ifdef FEAT_WILDMENU
101-
static void cmdline_del __ARGS((int from));
102-
#endif
103-
static void redrawcmdprompt __ARGS((void));
104-
static void cursorcmd __ARGS((void));
105-
static int ccheck_abbr __ARGS((int));
106-
static int nextwild __ARGS((expand_T *xp, int type, int options, int escape));
107-
static void escape_fname __ARGS((char_u **pp));
108-
static int showmatches __ARGS((expand_T *xp, int wildmenu));
109-
static void set_expand_context __ARGS((expand_T *xp));
110-
static int ExpandFromContext __ARGS((expand_T *xp, char_u *, int *, char_u ***, int));
111-
static int expand_showtail __ARGS((expand_T *xp));
101+
static void cmdline_del(int from);
102+
#endif
103+
static void redrawcmdprompt(void);
104+
static void cursorcmd(void);
105+
static int ccheck_abbr(int);
106+
static int nextwild(expand_T *xp, int type, int options, int escape);
107+
static void escape_fname(char_u **pp);
108+
static int showmatches(expand_T *xp, int wildmenu);
109+
static void set_expand_context(expand_T *xp);
110+
static int ExpandFromContext(expand_T *xp, char_u *, int *, char_u ***, int);
111+
static int expand_showtail(expand_T *xp);
112112
#ifdef FEAT_CMDL_COMPL
113-
static int expand_shellcmd __ARGS((char_u *filepat, int *num_file, char_u ***file, int flagsarg));
114-
static int ExpandRTDir __ARGS((char_u *pat, int *num_file, char_u ***file, char *dirname[]));
113+
static int expand_shellcmd(char_u *filepat, int *num_file, char_u ***file, int flagsarg);
114+
static int ExpandRTDir(char_u *pat, int *num_file, char_u ***file, char *dirname[]);
115115
# ifdef FEAT_CMDHIST
116-
static char_u *get_history_arg __ARGS((expand_T *xp, int idx));
116+
static char_u *get_history_arg(expand_T *xp, int idx);
117117
# endif
118118
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
119-
static int ExpandUserDefined __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file));
120-
static int ExpandUserList __ARGS((expand_T *xp, int *num_file, char_u ***file));
119+
static int ExpandUserDefined(expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file);
120+
static int ExpandUserList(expand_T *xp, int *num_file, char_u ***file);
121121
# endif
122122
#endif
123123
#ifdef FEAT_CMDHIST
124-
static void clear_hist_entry __ARGS((histentry_T *hisptr));
124+
static void clear_hist_entry(histentry_T *hisptr);
125125
#endif
126126

127127
#ifdef FEAT_CMDWIN
128-
static int ex_window __ARGS((void));
128+
static int ex_window(void);
129129
#endif
130130

131131
#if defined(FEAT_CMDL_COMPL) || defined(PROTO)
132132
static int
133133
#ifdef __BORLANDC__
134134
_RTLENTRYF
135135
#endif
136-
sort_func_compare __ARGS((const void *s1, const void *s2));
136+
sort_func_compare(const void *s1, const void *s2);
137137
#endif
138138

139139
/*
@@ -4530,7 +4530,7 @@ expand_cmdline(xp, str, col, matchcount, matches)
45304530
/*
45314531
* Cleanup matches for help tags: remove "@en" if "en" is the only language.
45324532
*/
4533-
static void cleanup_help_tags __ARGS((int num_file, char_u **file));
4533+
static void cleanup_help_tags(int num_file, char_u **file);
45344534

45354535
static void
45364536
cleanup_help_tags(num_file, file)
@@ -5009,15 +5009,15 @@ expand_shellcmd(filepat, num_file, file, flagsarg)
50095009

50105010

50115011
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
5012-
static void * call_user_expand_func __ARGS((void *(*user_expand_func) __ARGS((char_u *, int, char_u **, int)), expand_T *xp, int *num_file, char_u ***file));
5012+
static void * call_user_expand_func(void *(*user_expand_func)(char_u *, int, char_u **, int), expand_T *xp, int *num_file, char_u ***file);
50135013

50145014
/*
50155015
* Call "user_expand_func()" to invoke a user defined VimL function and return
50165016
* the result (either a string or a List).
50175017
*/
50185018
static void *
50195019
call_user_expand_func(user_expand_func, xp, num_file, file)
5020-
void *(*user_expand_func) __ARGS((char_u *, int, char_u **, int));
5020+
void *(*user_expand_func)(char_u *, int, char_u **, int);
50215021
expand_T *xp;
50225022
int *num_file;
50235023
char_u ***file;
@@ -5610,7 +5610,7 @@ get_history_idx(histype)
56105610
return history[histype][hisidx[histype]].hisnum;
56115611
}
56125612

5613-
static struct cmdline_info *get_ccline_ptr __ARGS((void));
5613+
static struct cmdline_info *get_ccline_ptr(void);
56145614

56155615
/*
56165616
* Get pointer to the command line info to use. cmdline_paste() may clear
@@ -6066,7 +6066,7 @@ static int viminfo_hisidx[HIST_COUNT] = {0, 0, 0, 0};
60666066
static int viminfo_hislen[HIST_COUNT] = {0, 0, 0, 0};
60676067
static int viminfo_add_at_front = FALSE;
60686068

6069-
static int hist_type2char __ARGS((int type, int use_question));
6069+
static int hist_type2char(int type, int use_question);
60706070

60716071
/*
60726072
* Translate a history type number to the associated character.

‎src/farsi.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@
1313
* Included by main.c, when FEAT_FKMAP is defined.
1414
*/
1515

16-
static int toF_Xor_X_ __ARGS((int c));
17-
static int F_is_TyE __ARGS((int c));
18-
static int F_is_TyC_TyD __ARGS((int c));
19-
static int F_is_TyB_TyC_TyD __ARGS((int src, int offset));
20-
static int toF_TyB __ARGS((int c));
21-
static void put_curr_and_l_to_X __ARGS((int c));
22-
static void put_and_redo __ARGS((int c));
23-
static void chg_c_toX_orX __ARGS((void));
24-
static void chg_c_to_X_orX_ __ARGS((void));
25-
static void chg_c_to_X_or_X __ARGS((void));
26-
static void chg_l_to_X_orX_ __ARGS((void));
27-
static void chg_l_toXor_X __ARGS((void));
28-
static void chg_r_to_Xor_X_ __ARGS((void));
29-
static int toF_leading __ARGS((int c));
30-
static int toF_Rjoin __ARGS((int c));
31-
static int canF_Ljoin __ARGS((int c));
32-
static int canF_Rjoin __ARGS((int c));
33-
static int F_isterm __ARGS((int c));
34-
static int toF_ending __ARGS((int c));
35-
static void lrswapbuf __ARGS((char_u *buf, int len));
16+
static int toF_Xor_X_(int c);
17+
static int F_is_TyE(int c);
18+
static int F_is_TyC_TyD(int c);
19+
static int F_is_TyB_TyC_TyD(int src, int offset);
20+
static int toF_TyB(int c);
21+
static void put_curr_and_l_to_X(int c);
22+
static void put_and_redo(int c);
23+
static void chg_c_toX_orX(void);
24+
static void chg_c_to_X_orX_(void);
25+
static void chg_c_to_X_or_X(void);
26+
static void chg_l_to_X_orX_(void);
27+
static void chg_l_toXor_X(void);
28+
static void chg_r_to_Xor_X_(void);
29+
static int toF_leading(int c);
30+
static int toF_Rjoin(int c);
31+
static int canF_Ljoin(int c);
32+
static int canF_Rjoin(int c);
33+
static int F_isterm(int c);
34+
static int toF_ending(int c);
35+
static void lrswapbuf(char_u *buf, int len);
3636

3737
/*
3838
** Convert the given Farsi character into a _X or _X_ type

‎src/fileio.c‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,28 @@
3232
static int is_dev_fd_file(char_u *fname);
3333
#endif
3434
#ifdef FEAT_MBYTE
35-
static char_u *next_fenc __ARGS((char_u **pp));
35+
static char_u *next_fenc(char_u **pp);
3636
# ifdef FEAT_EVAL
37-
static char_u *readfile_charconvert __ARGS((char_u *fname, char_u *fenc, int *fdp));
37+
static char_u *readfile_charconvert(char_u *fname, char_u *fenc, int *fdp);
3838
# endif
3939
#endif
4040
#ifdef FEAT_VIMINFO
41-
static void check_marks_read __ARGS((void));
41+
static void check_marks_read(void);
4242
#endif
4343
#ifdef FEAT_CRYPT
44-
static char_u *check_for_cryptkey __ARGS((char_u *cryptkey, char_u *ptr, long *sizep, off_t *filesizep, int newfile, char_u *fname, int *did_ask));
44+
static char_u *check_for_cryptkey(char_u *cryptkey, char_u *ptr, long *sizep, off_t *filesizep, int newfile, char_u *fname, int *did_ask);
4545
#endif
4646
#ifdef UNIX
47-
static void set_file_time __ARGS((char_u *fname, time_t atime, time_t mtime));
47+
static void set_file_time(char_u *fname, time_t atime, time_t mtime);
4848
#endif
49-
static int set_rw_fname __ARGS((char_u *fname, char_u *sfname));
50-
static int msg_add_fileformat __ARGS((int eol_type));
51-
static void msg_add_eol __ARGS((void));
52-
static int check_mtime __ARGS((buf_T *buf, struct stat *s));
53-
static int time_differs __ARGS((long t1, long t2));
49+
static int set_rw_fname(char_u *fname, char_u *sfname);
50+
static int msg_add_fileformat(int eol_type);
51+
static void msg_add_eol(void);
52+
static int check_mtime(buf_T *buf, struct stat *s);
53+
static int time_differs(long t1, long t2);
5454
#ifdef FEAT_AUTOCMD
55-
static int apply_autocmds_exarg __ARGS((event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, exarg_T *eap));
56-
static int au_find_group __ARGS((char_u *name));
55+
static int apply_autocmds_exarg(event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, exarg_T *eap);
56+
static int au_find_group(char_u *name);
5757

5858
# define AUGROUP_DEFAULT -1 /* default autocmd group */
5959
# define AUGROUP_ERROR -2 /* erroneous autocmd group */
@@ -119,25 +119,25 @@ struct bw_info
119119
#endif
120120
};
121121

122-
static int buf_write_bytes __ARGS((struct bw_info *ip));
122+
static int buf_write_bytes(struct bw_info *ip);
123123

124124
#ifdef FEAT_MBYTE
125-
static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
126-
static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
127-
static int need_conversion __ARGS((char_u *fenc));
128-
static int get_fio_flags __ARGS((char_u *ptr));
129-
static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
130-
static int make_bom __ARGS((char_u *buf, char_u *name));
125+
static linenr_T readfile_linenr(linenr_T linecnt, char_u *p, char_u *endp);
126+
static int ucs2bytes(unsigned c, char_u **pp, int flags);
127+
static int need_conversion(char_u *fenc);
128+
static int get_fio_flags(char_u *ptr);
129+
static char_u *check_for_bom(char_u *p, long size, int *lenp, int flags);
130+
static int make_bom(char_u *buf, char_u *name);
131131
# ifdef WIN3264
132-
static int get_win_fio_flags __ARGS((char_u *ptr));
132+
static int get_win_fio_flags(char_u *ptr);
133133
# endif
134134
# ifdef MACOS_X
135-
static int get_mac_fio_flags __ARGS((char_u *ptr));
135+
static int get_mac_fio_flags(char_u *ptr);
136136
# endif
137137
#endif
138-
static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
138+
static int move_lines(buf_T *frombuf, buf_T *tobuf);
139139
#ifdef TEMPDIRNAMES
140-
static void vim_settempdir __ARGS((char_u *tempdir));
140+
static void vim_settempdir(char_u *tempdir);
141141
#endif
142142
#ifdef FEAT_AUTOCMD
143143
static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
@@ -7811,22 +7811,22 @@ static int current_augroup = AUGROUP_DEFAULT;
78117811

78127812
static int au_need_clean = FALSE; /* need to delete marked patterns */
78137813

7814-
static void show_autocmd __ARGS((AutoPat *ap, event_T event));
7815-
static void au_remove_pat __ARGS((AutoPat *ap));
7816-
static void au_remove_cmds __ARGS((AutoPat *ap));
7817-
static void au_cleanup __ARGS((void));
7818-
static int au_new_group __ARGS((char_u *name));
7819-
static void au_del_group __ARGS((char_u *name));
7820-
static event_T event_name2nr __ARGS((char_u *start, char_u **end));
7821-
static char_u *event_nr2name __ARGS((event_T event));
7822-
static char_u *find_end_event __ARGS((char_u *arg, int have_group));
7823-
static int event_ignored __ARGS((event_T event));
7824-
static int au_get_grouparg __ARGS((char_u **argp));
7825-
static int do_autocmd_event __ARGS((event_T event, char_u *pat, int nested, char_u *cmd, int forceit, int group));
7826-
static int apply_autocmds_group __ARGS((event_T event, char_u *fname, char_u *fname_io, int force, int group, buf_T *buf, exarg_T *eap));
7827-
static void auto_next_pat __ARGS((AutoPatCmd *apc, int stop_at_last));
7814+
static void show_autocmd(AutoPat *ap, event_T event);
7815+
static void au_remove_pat(AutoPat *ap);
7816+
static void au_remove_cmds(AutoPat *ap);
7817+
static void au_cleanup(void);
7818+
static int au_new_group(char_u *name);
7819+
static void au_del_group(char_u *name);
7820+
static event_T event_name2nr(char_u *start, char_u **end);
7821+
static char_u *event_nr2name(event_T event);
7822+
static char_u *find_end_event(char_u *arg, int have_group);
7823+
static int event_ignored(event_T event);
7824+
static int au_get_grouparg(char_u **argp);
7825+
static int do_autocmd_event(event_T event, char_u *pat, int nested, char_u *cmd, int forceit, int group);
7826+
static int apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io, int force, int group, buf_T *buf, exarg_T *eap);
7827+
static void auto_next_pat(AutoPatCmd *apc, int stop_at_last);
78287828
#if defined(FEAT_AUTOCMD) || defined(FEAT_WILDIGN)
7829-
static int match_file_pat __ARGS((char_u *pattern, regprog_T **prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs));
7829+
static int match_file_pat(char_u *pattern, regprog_T **prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs);
78307830
#endif
78317831

78327832

0 commit comments

Comments
 (0)