Skip to content

Commit baaa7e9

Browse files
brammoolbrammool
committed
patch 7.4.1199
Problem: Still using __ARGS. Solution: Remove __ARGS in several files. (script by Hirohito Higashi)
1 parent 92b8b2d commit baaa7e9

24 files changed

+788
-786
lines changed

‎src/ops.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -89,39 +89,39 @@ struct block_def
8989
};
9090

9191
#ifdef FEAT_VISUALEXTRA
92-
static void shift_block __ARGS((oparg_T *oap, int amount));
93-
static void block_insert __ARGS((oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp));
94-
#endif
95-
static int stuff_yank __ARGS((int, char_u *));
96-
static void put_reedit_in_typebuf __ARGS((int silent));
97-
static int put_in_typebuf __ARGS((char_u *s, int esc, int colon,
98-
int silent));
99-
static void stuffescaped __ARGS((char_u *arg, int literally));
92+
static void shift_block(oparg_T *oap, int amount);
93+
static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp);
94+
#endif
95+
static int stuff_yank(int, char_u *);
96+
static void put_reedit_in_typebuf(int silent);
97+
static int put_in_typebuf(char_u *s, int esc, int colon,
98+
int silent);
99+
static void stuffescaped(char_u *arg, int literally);
100100
#ifdef FEAT_MBYTE
101-
static void mb_adjust_opend __ARGS((oparg_T *oap));
101+
static void mb_adjust_opend(oparg_T *oap);
102102
#endif
103-
static void free_yank __ARGS((long));
104-
static void free_yank_all __ARGS((void));
105-
static int yank_copy_line __ARGS((struct block_def *bd, long y_idx));
103+
static void free_yank(long);
104+
static void free_yank_all(void);
105+
static int yank_copy_line(struct block_def *bd, long y_idx);
106106
#ifdef FEAT_CLIPBOARD
107-
static void copy_yank_reg __ARGS((struct yankreg *reg));
108-
static void may_set_selection __ARGS((void));
107+
static void copy_yank_reg(struct yankreg *reg);
108+
static void may_set_selection(void);
109109
#endif
110-
static void dis_msg __ARGS((char_u *p, int skip_esc));
110+
static void dis_msg(char_u *p, int skip_esc);
111111
#if defined(FEAT_COMMENTS) || defined(PROTO)
112-
static char_u *skip_comment __ARGS((char_u *line, int process, int include_space, int *is_comment));
112+
static char_u *skip_comment(char_u *line, int process, int include_space, int *is_comment);
113113
#endif
114-
static void block_prep __ARGS((oparg_T *oap, struct block_def *, linenr_T, int));
115-
static int do_addsub __ARGS((int op_type, pos_T *pos, int length, linenr_T Prenum1));
114+
static void block_prep(oparg_T *oap, struct block_def *, linenr_T, int);
115+
static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1);
116116
#if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL)
117-
static void str_to_reg __ARGS((struct yankreg *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list));
117+
static void str_to_reg(struct yankreg *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list);
118118
#endif
119-
static int ends_in_white __ARGS((linenr_T lnum));
119+
static int ends_in_white(linenr_T lnum);
120120
#ifdef FEAT_COMMENTS
121-
static int same_leader __ARGS((linenr_T lnum, int, char_u *, int, char_u *));
122-
static int fmt_check_par __ARGS((linenr_T, int *, char_u **, int do_comments));
121+
static int same_leader(linenr_T lnum, int, char_u *, int, char_u *);
122+
static int fmt_check_par(linenr_T, int *, char_u **, int do_comments);
123123
#else
124-
static int fmt_check_par __ARGS((linenr_T));
124+
static int fmt_check_par(linenr_T);
125125
#endif
126126

127127
/*
@@ -689,7 +689,7 @@ block_insert(oap, s, b_insert, bdp)
689689
void
690690
op_reindent(oap, how)
691691
oparg_T *oap;
692-
int (*how) __ARGS((void));
692+
int (*how)(void);
693693
{
694694
long i;
695695
char_u *l;
@@ -2276,7 +2276,7 @@ op_replace(oap, c)
22762276
}
22772277
#endif
22782278

2279-
static int swapchars __ARGS((int op_type, pos_T *pos, int length));
2279+
static int swapchars(int op_type, pos_T *pos, int length);
22802280

22812281
/*
22822282
* Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?".
@@ -6429,7 +6429,7 @@ get_reg_type(regname, reglen)
64296429
return MAUTO;
64306430
}
64316431

6432-
static char_u *getreg_wrap_one_line __ARGS((char_u *s, int flags));
6432+
static char_u *getreg_wrap_one_line(char_u *s, int flags);
64336433

64346434
/*
64356435
* When "flags" has GREG_LIST return a list with text "s".
@@ -6905,7 +6905,7 @@ clear_oparg(oap)
69056905
vim_memset(oap, 0, sizeof(oparg_T));
69066906
}
69076907

6908-
static long line_count_info __ARGS((char_u *line, long *wc, long *cc, long limit, int eol_size));
6908+
static long line_count_info(char_u *line, long *wc, long *cc, long limit, int eol_size);
69096909

69106910
/*
69116911
* Count the number of bytes, characters and "words" in a line.

‎src/option.c

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3088,75 +3088,75 @@ static char *(p_fcl_values[]) = {"all", NULL};
30883088
static char *(p_cot_values[]) = {"menu", "menuone", "longest", "preview", "noinsert", "noselect", NULL};
30893089
#endif
30903090

3091-
static void set_option_default __ARGS((int, int opt_flags, int compatible));
3092-
static void set_options_default __ARGS((int opt_flags));
3093-
static char_u *term_bg_default __ARGS((void));
3094-
static void did_set_option __ARGS((int opt_idx, int opt_flags, int new_value));
3095-
static char_u *illegal_char __ARGS((char_u *, int));
3096-
static int string_to_key __ARGS((char_u *arg));
3091+
static void set_option_default(int, int opt_flags, int compatible);
3092+
static void set_options_default(int opt_flags);
3093+
static char_u *term_bg_default(void);
3094+
static void did_set_option(int opt_idx, int opt_flags, int new_value);
3095+
static char_u *illegal_char(char_u *, int);
3096+
static int string_to_key(char_u *arg);
30973097
#ifdef FEAT_CMDWIN
3098-
static char_u *check_cedit __ARGS((void));
3098+
static char_u *check_cedit(void);
30993099
#endif
31003100
#ifdef FEAT_TITLE
3101-
static void did_set_title __ARGS((int icon));
3101+
static void did_set_title(int icon);
31023102
#endif
3103-
static char_u *option_expand __ARGS((int opt_idx, char_u *val));
3104-
static void didset_options __ARGS((void));
3105-
static void didset_options2 __ARGS((void));
3106-
static void check_string_option __ARGS((char_u **pp));
3103+
static char_u *option_expand(int opt_idx, char_u *val);
3104+
static void didset_options(void);
3105+
static void didset_options2(void);
3106+
static void check_string_option(char_u **pp);
31073107
#if defined(FEAT_EVAL) || defined(PROTO)
3108-
static long_u *insecure_flag __ARGS((int opt_idx, int opt_flags));
3108+
static long_u *insecure_flag(int opt_idx, int opt_flags);
31093109
#else
31103110
# define insecure_flag(opt_idx, opt_flags) (&options[opt_idx].flags)
31113111
#endif
3112-
static void set_string_option_global __ARGS((int opt_idx, char_u **varp));
3113-
static char_u *set_string_option __ARGS((int opt_idx, char_u *value, int opt_flags));
3114-
static char_u *did_set_string_option __ARGS((int opt_idx, char_u **varp, int new_value_alloced, char_u *oldval, char_u *errbuf, int opt_flags));
3115-
static char_u *set_chars_option __ARGS((char_u **varp));
3112+
static void set_string_option_global(int opt_idx, char_u **varp);
3113+
static char_u *set_string_option(int opt_idx, char_u *value, int opt_flags);
3114+
static char_u *did_set_string_option(int opt_idx, char_u **varp, int new_value_alloced, char_u *oldval, char_u *errbuf, int opt_flags);
3115+
static char_u *set_chars_option(char_u **varp);
31163116
#ifdef FEAT_SYN_HL
3117-
static int int_cmp __ARGS((const void *a, const void *b));
3117+
static int int_cmp(const void *a, const void *b);
31183118
#endif
31193119
#ifdef FEAT_CLIPBOARD
3120-
static char_u *check_clipboard_option __ARGS((void));
3120+
static char_u *check_clipboard_option(void);
31213121
#endif
31223122
#ifdef FEAT_SPELL
3123-
static char_u *did_set_spell_option __ARGS((int is_spellfile));
3124-
static char_u *compile_cap_prog __ARGS((synblock_T *synblock));
3123+
static char_u *did_set_spell_option(int is_spellfile);
3124+
static char_u *compile_cap_prog(synblock_T *synblock);
31253125
#endif
31263126
#ifdef FEAT_EVAL
3127-
static void set_option_scriptID_idx __ARGS((int opt_idx, int opt_flags, int id));
3128-
#endif
3129-
static char_u *set_bool_option __ARGS((int opt_idx, char_u *varp, int value, int opt_flags));
3130-
static char_u *set_num_option __ARGS((int opt_idx, char_u *varp, long value, char_u *errbuf, size_t errbuflen, int opt_flags));
3131-
static void check_redraw __ARGS((long_u flags));
3132-
static int findoption __ARGS((char_u *));
3133-
static int find_key_option __ARGS((char_u *));
3134-
static void showoptions __ARGS((int all, int opt_flags));
3135-
static int optval_default __ARGS((struct vimoption *, char_u *varp));
3136-
static void showoneopt __ARGS((struct vimoption *, int opt_flags));
3137-
static int put_setstring __ARGS((FILE *fd, char *cmd, char *name, char_u **valuep, int expand));
3138-
static int put_setnum __ARGS((FILE *fd, char *cmd, char *name, long *valuep));
3139-
static int put_setbool __ARGS((FILE *fd, char *cmd, char *name, int value));
3140-
static int istermoption __ARGS((struct vimoption *));
3141-
static char_u *get_varp_scope __ARGS((struct vimoption *p, int opt_flags));
3142-
static char_u *get_varp __ARGS((struct vimoption *));
3143-
static void option_value2string __ARGS((struct vimoption *, int opt_flags));
3144-
static void check_winopt __ARGS((winopt_T *wop));
3145-
static int wc_use_keyname __ARGS((char_u *varp, long *wcp));
3127+
static void set_option_scriptID_idx(int opt_idx, int opt_flags, int id);
3128+
#endif
3129+
static char_u *set_bool_option(int opt_idx, char_u *varp, int value, int opt_flags);
3130+
static char_u *set_num_option(int opt_idx, char_u *varp, long value, char_u *errbuf, size_t errbuflen, int opt_flags);
3131+
static void check_redraw(long_u flags);
3132+
static int findoption(char_u *);
3133+
static int find_key_option(char_u *);
3134+
static void showoptions(int all, int opt_flags);
3135+
static int optval_default(struct vimoption *, char_u *varp);
3136+
static void showoneopt(struct vimoption *, int opt_flags);
3137+
static int put_setstring(FILE *fd, char *cmd, char *name, char_u **valuep, int expand);
3138+
static int put_setnum(FILE *fd, char *cmd, char *name, long *valuep);
3139+
static int put_setbool(FILE *fd, char *cmd, char *name, int value);
3140+
static int istermoption(struct vimoption *);
3141+
static char_u *get_varp_scope(struct vimoption *p, int opt_flags);
3142+
static char_u *get_varp(struct vimoption *);
3143+
static void option_value2string(struct vimoption *, int opt_flags);
3144+
static void check_winopt(winopt_T *wop);
3145+
static int wc_use_keyname(char_u *varp, long *wcp);
31463146
#ifdef FEAT_LANGMAP
3147-
static void langmap_init __ARGS((void));
3148-
static void langmap_set __ARGS((void));
3147+
static void langmap_init(void);
3148+
static void langmap_set(void);
31493149
#endif
3150-
static void paste_option_changed __ARGS((void));
3151-
static void compatible_set __ARGS((void));
3150+
static void paste_option_changed(void);
3151+
static void compatible_set(void);
31523152
#ifdef FEAT_LINEBREAK
3153-
static void fill_breakat_flags __ARGS((void));
3153+
static void fill_breakat_flags(void);
31543154
#endif
3155-
static int opt_strings_flags __ARGS((char_u *val, char **values, unsigned *flagp, int list));
3156-
static int check_opt_strings __ARGS((char_u *val, char **values, int));
3157-
static int check_opt_wim __ARGS((void));
3155+
static int opt_strings_flags(char_u *val, char **values, unsigned *flagp, int list);
3156+
static int check_opt_strings(char_u *val, char **values, int);
3157+
static int check_opt_wim(void);
31583158
#ifdef FEAT_LINEBREAK
3159-
static int briopt_check __ARGS((win_T *wp));
3159+
static int briopt_check(win_T *wp);
31603160
#endif
31613161

31623162
/*
@@ -4085,7 +4085,7 @@ set_helplang_default(lang)
40854085
#endif
40864086

40874087
#ifdef FEAT_GUI
4088-
static char_u *gui_bg_default __ARGS((void));
4088+
static char_u *gui_bg_default(void);
40894089

40904090
static char_u *
40914091
gui_bg_default()
@@ -5656,7 +5656,7 @@ insecure_flag(opt_idx, opt_flags)
56565656
#endif
56575657

56585658
#ifdef FEAT_TITLE
5659-
static void redraw_titles __ARGS((void));
5659+
static void redraw_titles(void);
56605660

56615661
/*
56625662
* Redraw the window title and/or tab page text later.
@@ -11486,7 +11486,7 @@ typedef struct
1148611486
} langmap_entry_T;
1148711487

1148811488
static garray_T langmap_mapga;
11489-
static void langmap_set_entry __ARGS((int from, int to));
11489+
static void langmap_set_entry(int from, int to);
1149011490

1149111491
/*
1149211492
* Search for an entry in "langmap_mapga" for "from". If found set the "to"

‎src/os_amiga.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
#ifdef __amigaos4__
7272
# define dos_packet(a, b, c) DoPkt(a, b, c, 0, 0, 0, 0)
7373
#elif !defined(AZTEC_C) && !defined(__AROS__)
74-
static long dos_packet __ARGS((struct MsgPort *, long, long));
74+
static long dos_packet(struct MsgPort *, long, long);
7575
#endif
76-
static int lock2name __ARGS((BPTR lock, char_u *buf, long len));
77-
static void out_num __ARGS((long n));
78-
static struct FileInfoBlock *get_fib __ARGS((char_u *));
79-
static int sortcmp __ARGS((const void *a, const void *b));
76+
static int lock2name(BPTR lock, char_u *buf, long len);
77+
static void out_num(long n);
78+
static struct FileInfoBlock *get_fib(char_u *);
79+
static int sortcmp(const void *a, const void *b);
8080

8181
static BPTR raw_in = (BPTR)NULL;
8282
static BPTR raw_out = (BPTR)NULL;
@@ -219,7 +219,7 @@ mch_delay(msec, ignoreinput)
219219
int ignoreinput;
220220
{
221221
#ifndef LATTICE /* SAS declares void Delay(ULONG) */
222-
void Delay __ARGS((long));
222+
void Delay(long);
223223
#endif
224224

225225
if (msec > 0)

‎src/os_mac_conv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ typedef int *TECObjectRef;
3131
typedef int CFStringRef;
3232
# endif
3333

34-
static char_u *mac_utf16_to_utf8 __ARGS((UniChar *from, size_t fromLen, size_t *actualLen));
35-
static UniChar *mac_utf8_to_utf16 __ARGS((char_u *from, size_t fromLen, size_t *actualLen));
34+
static char_u *mac_utf16_to_utf8(UniChar *from, size_t fromLen, size_t *actualLen);
35+
static UniChar *mac_utf8_to_utf16(char_u *from, size_t fromLen, size_t *actualLen);
3636

3737
/* Converter for composing decomposed HFS+ file paths */
3838
static TECObjectRef gPathConverter;

0 commit comments

Comments
 (0)