Skip to content

Commit 92b8b2d

Browse files
brammoolbrammool
committed
patch 7.4.1198
Problem: Still using __ARGS. Solution: Remove __ARGS in several files. (script by Hirohito Higashi) Also remove use of HAVE_STDARG_H.
1 parent d25c16e commit 92b8b2d

22 files changed

+560
-690
lines changed

‎src/gui_x11.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ static XFontSet current_fontset = NULL;
123123
XDrawImageString16(dpy, win, gc, x, y, (XChar2b *)str, n); \
124124
} while (0)
125125

126-
static int check_fontset_sanity __ARGS((XFontSet fs));
127-
static int fontset_width __ARGS((XFontSet fs));
128-
static int fontset_ascent __ARGS((XFontSet fs));
126+
static int check_fontset_sanity(XFontSet fs);
127+
static int fontset_width(XFontSet fs);
128+
static int fontset_ascent(XFontSet fs);
129129
#endif
130130

131131
static guicolor_T prev_fg_color = INVALCOLOR;
@@ -136,26 +136,26 @@ static guicolor_T prev_sp_color = INVALCOLOR;
136136
static XButtonPressedEvent last_mouse_event;
137137
#endif
138138

139-
static int find_closest_color __ARGS((Colormap colormap, XColor *colorPtr));
140-
static void gui_x11_timer_cb __ARGS((XtPointer timed_out, XtIntervalId *interval_id));
141-
static void gui_x11_visibility_cb __ARGS((Widget w, XtPointer dud, XEvent *event, Boolean *dum));
142-
static void gui_x11_expose_cb __ARGS((Widget w, XtPointer dud, XEvent *event, Boolean *dum));
143-
static void gui_x11_resize_window_cb __ARGS((Widget w, XtPointer dud, XEvent *event, Boolean *dum));
144-
static void gui_x11_focus_change_cb __ARGS((Widget w, XtPointer data, XEvent *event, Boolean *dum));
145-
static void gui_x11_enter_cb __ARGS((Widget w, XtPointer data, XEvent *event, Boolean *dum));
146-
static void gui_x11_leave_cb __ARGS((Widget w, XtPointer data, XEvent *event, Boolean *dum));
147-
static void gui_x11_mouse_cb __ARGS((Widget w, XtPointer data, XEvent *event, Boolean *dum));
139+
static int find_closest_color(Colormap colormap, XColor *colorPtr);
140+
static void gui_x11_timer_cb(XtPointer timed_out, XtIntervalId *interval_id);
141+
static void gui_x11_visibility_cb(Widget w, XtPointer dud, XEvent *event, Boolean *dum);
142+
static void gui_x11_expose_cb(Widget w, XtPointer dud, XEvent *event, Boolean *dum);
143+
static void gui_x11_resize_window_cb(Widget w, XtPointer dud, XEvent *event, Boolean *dum);
144+
static void gui_x11_focus_change_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
145+
static void gui_x11_enter_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
146+
static void gui_x11_leave_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
147+
static void gui_x11_mouse_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
148148
#ifdef FEAT_SNIFF
149-
static void gui_x11_sniff_request_cb __ARGS((XtPointer closure, int *source, XtInputId *id));
149+
static void gui_x11_sniff_request_cb(XtPointer closure, int *source, XtInputId *id);
150150
#endif
151-
static void gui_x11_check_copy_area __ARGS((void));
151+
static void gui_x11_check_copy_area(void);
152152
#ifdef FEAT_CLIENTSERVER
153-
static void gui_x11_send_event_handler __ARGS((Widget, XtPointer, XEvent *, Boolean *));
153+
static void gui_x11_send_event_handler(Widget, XtPointer, XEvent *, Boolean *);
154154
#endif
155-
static void gui_x11_wm_protocol_handler __ARGS((Widget, XtPointer, XEvent *, Boolean *));
156-
static void gui_x11_blink_cb __ARGS((XtPointer timed_out, XtIntervalId *interval_id));
157-
static Cursor gui_x11_create_blank_mouse __ARGS((void));
158-
static void draw_curl __ARGS((int row, int col, int cells));
155+
static void gui_x11_wm_protocol_handler(Widget, XtPointer, XEvent *, Boolean *);
156+
static void gui_x11_blink_cb(XtPointer timed_out, XtIntervalId *interval_id);
157+
static Cursor gui_x11_create_blank_mouse(void);
158+
static void draw_curl(int row, int col, int cells);
159159

160160

161161
/*
@@ -1312,7 +1312,7 @@ gui_mch_init_check()
13121312
*/
13131313
static XtInputId _xsmp_xtinputid;
13141314

1315-
static void local_xsmp_handle_requests __ARGS((XtPointer c, int *s, XtInputId *i));
1315+
static void local_xsmp_handle_requests(XtPointer c, int *s, XtInputId *i);
13161316

13171317
static void
13181318
local_xsmp_handle_requests(c, s, i)

‎src/hangulin.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ static char_u stack[20] = {0};
3535
static int last_l = -1, last_ll = -1;
3636
static int hangul_keyboard_type = HANGUL_DEFAULT_KEYBOARD;
3737

38-
static void convert_ks_to_3 __ARGS((const char_u *src, int *fp, int *mp, int *lp));
39-
static int convert_3_to_ks __ARGS((int fv, int mv, int lv, char_u *des));
40-
static int hangul_automata2 __ARGS((char_u *buf, unsigned int *c));
41-
static int hangul_automata3 __ARGS((char_u *buf, unsigned int *c));
38+
static void convert_ks_to_3(const char_u *src, int *fp, int *mp, int *lp);
39+
static int convert_3_to_ks(int fv, int mv, int lv, char_u *des);
40+
static int hangul_automata2(char_u *buf, unsigned int *c);
41+
static int hangul_automata3(char_u *buf, unsigned int *c);
4242

4343
#define push(x) {stack[ sp++ ] = *(x); stack[sp++] = *((x)+1);}
4444
#define pop(x) {*((x) + 1) = stack[--sp]; *(x) = stack[--sp];}

‎src/hardcopy.c‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,21 @@ typedef struct
135135
int ff; /* seen form feed character */
136136
} prt_pos_T;
137137

138-
static char_u *parse_list_options __ARGS((char_u *option_str, option_table_T *table, int table_size));
138+
static char_u *parse_list_options(char_u *option_str, option_table_T *table, int table_size);
139139

140140
#ifdef FEAT_SYN_HL
141-
static long_u darken_rgb __ARGS((long_u rgb));
142-
static long_u prt_get_term_color __ARGS((int colorindex));
141+
static long_u darken_rgb(long_u rgb);
142+
static long_u prt_get_term_color(int colorindex);
143143
#endif
144-
static void prt_set_fg __ARGS((long_u fg));
145-
static void prt_set_bg __ARGS((long_u bg));
146-
static void prt_set_font __ARGS((int bold, int italic, int underline));
147-
static void prt_line_number __ARGS((prt_settings_T *psettings, int page_line, linenr_T lnum));
148-
static void prt_header __ARGS((prt_settings_T *psettings, int pagenum, linenr_T lnum));
149-
static void prt_message __ARGS((char_u *s));
150-
static colnr_T hardcopy_line __ARGS((prt_settings_T *psettings, int page_line, prt_pos_T *ppos));
144+
static void prt_set_fg(long_u fg);
145+
static void prt_set_bg(long_u bg);
146+
static void prt_set_font(int bold, int italic, int underline);
147+
static void prt_line_number(prt_settings_T *psettings, int page_line, linenr_T lnum);
148+
static void prt_header(prt_settings_T *psettings, int pagenum, linenr_T lnum);
149+
static void prt_message(char_u *s);
150+
static colnr_T hardcopy_line(prt_settings_T *psettings, int page_line, prt_pos_T *ppos);
151151
#ifdef FEAT_SYN_HL
152-
static void prt_get_attr __ARGS((int hl_id, prt_text_attr_T* pattr, int modec));
152+
static void prt_get_attr(int hl_id, prt_text_attr_T* pattr, int modec);
153153
#endif
154154

155155
/*
@@ -1337,47 +1337,47 @@ static struct prt_dsc_comment_S prt_dsc_table[] =
13371337
PRT_DSC_ENDCOMMENTS_TYPE}
13381338
};
13391339

1340-
static void prt_write_file_raw_len __ARGS((char_u *buffer, int bytes));
1341-
static void prt_write_file __ARGS((char_u *buffer));
1342-
static void prt_write_file_len __ARGS((char_u *buffer, int bytes));
1343-
static void prt_write_string __ARGS((char *s));
1344-
static void prt_write_int __ARGS((int i));
1345-
static void prt_write_boolean __ARGS((int b));
1346-
static void prt_def_font __ARGS((char *new_name, char *encoding, int height, char *font));
1347-
static void prt_real_bits __ARGS((double real, int precision, int *pinteger, int *pfraction));
1348-
static void prt_write_real __ARGS((double val, int prec));
1349-
static void prt_def_var __ARGS((char *name, double value, int prec));
1350-
static void prt_flush_buffer __ARGS((void));
1351-
static void prt_resource_name __ARGS((char_u *filename, void *cookie));
1352-
static int prt_find_resource __ARGS((char *name, struct prt_ps_resource_S *resource));
1353-
static int prt_open_resource __ARGS((struct prt_ps_resource_S *resource));
1354-
static int prt_check_resource __ARGS((struct prt_ps_resource_S *resource, char_u *version));
1355-
static void prt_dsc_start __ARGS((void));
1356-
static void prt_dsc_noarg __ARGS((char *comment));
1357-
static void prt_dsc_textline __ARGS((char *comment, char *text));
1358-
static void prt_dsc_text __ARGS((char *comment, char *text));
1359-
static void prt_dsc_ints __ARGS((char *comment, int count, int *ints));
1360-
static void prt_dsc_requirements __ARGS((int duplex, int tumble, int collate, int color, int num_copies));
1361-
static void prt_dsc_docmedia __ARGS((char *paper_name, double width, double height, double weight, char *colour, char *type));
1362-
static void prt_dsc_resources __ARGS((char *comment, char *type, char *strings));
1363-
static void prt_dsc_font_resource __ARGS((char *resource, struct prt_ps_font_S *ps_font));
1364-
static float to_device_units __ARGS((int idx, double physsize, int def_number));
1365-
static void prt_page_margins __ARGS((double width, double height, double *left, double *right, double *top, double *bottom));
1366-
static void prt_font_metrics __ARGS((int font_scale));
1367-
static int prt_get_cpl __ARGS((void));
1368-
static int prt_get_lpp __ARGS((void));
1369-
static int prt_add_resource __ARGS((struct prt_ps_resource_S *resource));
1370-
static int prt_resfile_next_line __ARGS((void));
1371-
static int prt_resfile_strncmp __ARGS((int offset, char *string, int len));
1372-
static int prt_resfile_skip_nonws __ARGS((int offset));
1373-
static int prt_resfile_skip_ws __ARGS((int offset));
1374-
static int prt_next_dsc __ARGS((struct prt_dsc_line_S *p_dsc_line));
1340+
static void prt_write_file_raw_len(char_u *buffer, int bytes);
1341+
static void prt_write_file(char_u *buffer);
1342+
static void prt_write_file_len(char_u *buffer, int bytes);
1343+
static void prt_write_string(char *s);
1344+
static void prt_write_int(int i);
1345+
static void prt_write_boolean(int b);
1346+
static void prt_def_font(char *new_name, char *encoding, int height, char *font);
1347+
static void prt_real_bits(double real, int precision, int *pinteger, int *pfraction);
1348+
static void prt_write_real(double val, int prec);
1349+
static void prt_def_var(char *name, double value, int prec);
1350+
static void prt_flush_buffer(void);
1351+
static void prt_resource_name(char_u *filename, void *cookie);
1352+
static int prt_find_resource(char *name, struct prt_ps_resource_S *resource);
1353+
static int prt_open_resource(struct prt_ps_resource_S *resource);
1354+
static int prt_check_resource(struct prt_ps_resource_S *resource, char_u *version);
1355+
static void prt_dsc_start(void);
1356+
static void prt_dsc_noarg(char *comment);
1357+
static void prt_dsc_textline(char *comment, char *text);
1358+
static void prt_dsc_text(char *comment, char *text);
1359+
static void prt_dsc_ints(char *comment, int count, int *ints);
1360+
static void prt_dsc_requirements(int duplex, int tumble, int collate, int color, int num_copies);
1361+
static void prt_dsc_docmedia(char *paper_name, double width, double height, double weight, char *colour, char *type);
1362+
static void prt_dsc_resources(char *comment, char *type, char *strings);
1363+
static void prt_dsc_font_resource(char *resource, struct prt_ps_font_S *ps_font);
1364+
static float to_device_units(int idx, double physsize, int def_number);
1365+
static void prt_page_margins(double width, double height, double *left, double *right, double *top, double *bottom);
1366+
static void prt_font_metrics(int font_scale);
1367+
static int prt_get_cpl(void);
1368+
static int prt_get_lpp(void);
1369+
static int prt_add_resource(struct prt_ps_resource_S *resource);
1370+
static int prt_resfile_next_line(void);
1371+
static int prt_resfile_strncmp(int offset, char *string, int len);
1372+
static int prt_resfile_skip_nonws(int offset);
1373+
static int prt_resfile_skip_ws(int offset);
1374+
static int prt_next_dsc(struct prt_dsc_line_S *p_dsc_line);
13751375
#ifdef FEAT_MBYTE
1376-
static int prt_build_cid_fontname __ARGS((int font, char_u *name, int name_len));
1377-
static void prt_def_cidfont __ARGS((char *new_name, int height, char *cidfont));
1378-
static void prt_dup_cidfont __ARGS((char *original_name, char *new_name));
1379-
static int prt_match_encoding __ARGS((char *p_encoding, struct prt_ps_mbfont_S *p_cmap, struct prt_ps_encoding_S **pp_mbenc));
1380-
static int prt_match_charset __ARGS((char *p_charset, struct prt_ps_mbfont_S *p_cmap, struct prt_ps_charset_S **pp_mbchar));
1376+
static int prt_build_cid_fontname(int font, char_u *name, int name_len);
1377+
static void prt_def_cidfont(char *new_name, int height, char *cidfont);
1378+
static void prt_dup_cidfont(char *original_name, char *new_name);
1379+
static int prt_match_encoding(char *p_encoding, struct prt_ps_mbfont_S *p_cmap, struct prt_ps_encoding_S **pp_mbenc);
1380+
static int prt_match_charset(char *p_charset, struct prt_ps_mbfont_S *p_cmap, struct prt_ps_charset_S **pp_mbchar);
13811381
#endif
13821382

13831383
/*

‎src/hashtab.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static long hash_count_perturb = 0; /* count number of "misses" */
4141
/* Magic value for algorithm that walks through the array. */
4242
#define PERTURB_SHIFT 5
4343

44-
static int hash_may_resize __ARGS((hashtab_T *ht, int minitems));
44+
static int hash_may_resize(hashtab_T *ht, int minitems);
4545

4646
#if 0 /* currently not used */
4747
/*

‎src/if_cscope.c‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,43 @@
2020
#endif
2121
#include "if_cscope.h"
2222

23-
static void cs_usage_msg __ARGS((csid_e x));
24-
static int cs_add __ARGS((exarg_T *eap));
25-
static void cs_stat_emsg __ARGS((char *fname));
26-
static int cs_add_common __ARGS((char *, char *, char *));
27-
static int cs_check_for_connections __ARGS((void));
28-
static int cs_check_for_tags __ARGS((void));
29-
static int cs_cnt_connections __ARGS((void));
30-
static void cs_reading_emsg __ARGS((int idx));
31-
static int cs_cnt_matches __ARGS((int idx));
32-
static char * cs_create_cmd __ARGS((char *csoption, char *pattern));
33-
static int cs_create_connection __ARGS((int i));
34-
static void do_cscope_general __ARGS((exarg_T *eap, int make_split));
23+
static void cs_usage_msg(csid_e x);
24+
static int cs_add(exarg_T *eap);
25+
static void cs_stat_emsg(char *fname);
26+
static int cs_add_common(char *, char *, char *);
27+
static int cs_check_for_connections(void);
28+
static int cs_check_for_tags(void);
29+
static int cs_cnt_connections(void);
30+
static void cs_reading_emsg(int idx);
31+
static int cs_cnt_matches(int idx);
32+
static char * cs_create_cmd(char *csoption, char *pattern);
33+
static int cs_create_connection(int i);
34+
static void do_cscope_general(exarg_T *eap, int make_split);
3535
#ifdef FEAT_QUICKFIX
36-
static void cs_file_results __ARGS((FILE *, int *));
36+
static void cs_file_results(FILE *, int *);
3737
#endif
38-
static void cs_fill_results __ARGS((char *, int , int *, char ***,
39-
char ***, int *));
40-
static int cs_find __ARGS((exarg_T *eap));
41-
static int cs_find_common __ARGS((char *opt, char *pat, int, int, int, char_u *cmdline));
42-
static int cs_help __ARGS((exarg_T *eap));
43-
static void clear_csinfo __ARGS((int i));
44-
static int cs_insert_filelist __ARGS((char *, char *, char *,
45-
struct stat *));
46-
static int cs_kill __ARGS((exarg_T *eap));
47-
static void cs_kill_execute __ARGS((int, char *));
48-
static cscmd_T * cs_lookup_cmd __ARGS((exarg_T *eap));
49-
static char * cs_make_vim_style_matches __ARGS((char *, char *,
50-
char *, char *));
51-
static char * cs_manage_matches __ARGS((char **, char **, int, mcmd_e));
52-
static char * cs_parse_results __ARGS((int cnumber, char *buf, int bufsize, char **context, char **linenumber, char **search));
53-
static char * cs_pathcomponents __ARGS((char *path));
54-
static void cs_print_tags_priv __ARGS((char **, char **, int));
55-
static int cs_read_prompt __ARGS((int));
56-
static void cs_release_csp __ARGS((int, int freefnpp));
57-
static int cs_reset __ARGS((exarg_T *eap));
58-
static char * cs_resolve_file __ARGS((int, char *));
59-
static int cs_show __ARGS((exarg_T *eap));
38+
static void cs_fill_results(char *, int , int *, char ***,
39+
char ***, int *);
40+
static int cs_find(exarg_T *eap);
41+
static int cs_find_common(char *opt, char *pat, int, int, int, char_u *cmdline);
42+
static int cs_help(exarg_T *eap);
43+
static void clear_csinfo(int i);
44+
static int cs_insert_filelist(char *, char *, char *,
45+
struct stat *);
46+
static int cs_kill(exarg_T *eap);
47+
static void cs_kill_execute(int, char *);
48+
static cscmd_T * cs_lookup_cmd(exarg_T *eap);
49+
static char * cs_make_vim_style_matches(char *, char *,
50+
char *, char *);
51+
static char * cs_manage_matches(char **, char **, int, mcmd_e);
52+
static char * cs_parse_results(int cnumber, char *buf, int bufsize, char **context, char **linenumber, char **search);
53+
static char * cs_pathcomponents(char *path);
54+
static void cs_print_tags_priv(char **, char **, int);
55+
static int cs_read_prompt(int);
56+
static void cs_release_csp(int, int freefnpp);
57+
static int cs_reset(exarg_T *eap);
58+
static char * cs_resolve_file(int, char *);
59+
static int cs_show(exarg_T *eap);
6060

6161

6262
static csinfo_T * csinfo = NULL;
@@ -1405,7 +1405,7 @@ clear_csinfo(i)
14051405
}
14061406

14071407
#ifndef UNIX
1408-
static char *GetWin32Error __ARGS((void));
1408+
static char *GetWin32Error(void);
14091409

14101410
static char *
14111411
GetWin32Error()

‎src/if_python3.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ python3_enabled(int verbose)
692692
/* Load the standard Python exceptions - don't import the symbols from the
693693
* DLL, as this can cause errors (importing data symbols is not reliable).
694694
*/
695-
static void get_py3_exceptions __ARGS((void));
695+
static void get_py3_exceptions(void);
696696

697697
static void
698698
get_py3_exceptions()

‎src/if_sniff.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,21 @@ static char *init_cmds[]= {
126126

127127
/*-------- Function Prototypes ----------------------------------*/
128128

129-
static int ConnectToSniffEmacs __ARGS((void));
130-
static void sniff_connect __ARGS((void));
131-
static void HandleSniffRequest __ARGS((char* buffer));
132-
static int get_request __ARGS((int fd, char *buf, int maxlen));
133-
static void WriteToSniff __ARGS((char *str));
134-
static void SendRequest __ARGS((struct sn_cmd *command, char* symbol));
135-
static void vi_msg __ARGS((char *));
136-
static void vi_error_msg __ARGS((char *));
137-
static char *vi_symbol_under_cursor __ARGS((void));
138-
static void vi_open_file __ARGS((char *));
139-
static char *vi_buffer_name __ARGS((void));
140-
static buf_T *vi_find_buffer __ARGS((char *));
141-
static void vi_exec_cmd __ARGS((char *));
142-
static void vi_set_cursor_pos __ARGS((long char_nr));
143-
static long vi_cursor_pos __ARGS((void));
129+
static int ConnectToSniffEmacs(void);
130+
static void sniff_connect(void);
131+
static void HandleSniffRequest(char* buffer);
132+
static int get_request(int fd, char *buf, int maxlen);
133+
static void WriteToSniff(char *str);
134+
static void SendRequest(struct sn_cmd *command, char* symbol);
135+
static void vi_msg(char *);
136+
static void vi_error_msg(char *);
137+
static char *vi_symbol_under_cursor(void);
138+
static void vi_open_file(char *);
139+
static char *vi_buffer_name(void);
140+
static buf_T *vi_find_buffer(char *);
141+
static void vi_exec_cmd(char *);
142+
static void vi_set_cursor_pos(long char_nr);
143+
static long vi_cursor_pos(void);
144144

145145
/* debug trace */
146146
#if 0

0 commit comments

Comments
 (0)