commit 6c112fa8ba10722ecf353c99a6f2bd40c4e5242b
parent e0721839a3144decd3bef7da9901556f440a095b
Author: Kyle Milz <krwmilz@gmail.com>
Date: Thu, 19 Aug 2021 18:09:25 +0000
remove ARGS macro
Yeah we are going to go ahead and use arguments in function prototypes.
Diffstat:
11 files changed, 206 insertions(+), 218 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -181,7 +181,7 @@ put_bitmap(bitmap, x, y)
#if GREY
-static void shrink_glyph_grey ARGS((struct glyph *));
+static void shrink_glyph_grey(struct glyph *);
static void
put_image(g, x, y)
@@ -728,7 +728,7 @@ static ubyte scantable[256] = {
static void
spcl_scan(spcl_proc)
- void (*spcl_proc) ARGS((char *));
+ void (*spcl_proc)(char *);
{
ubyte ch;
ubyte n;
@@ -778,7 +778,7 @@ spcl_scan(spcl_proc)
*/
-static void show_status ARGS((struct xtimer *));
+static void show_status(struct xtimer *);
static struct xtimer pst = TIMER_INIT(show_status);
@@ -1593,8 +1593,8 @@ static struct frame *geom_scan_frame; /* head frame for scanning */
#endif
static struct frame *geom_current_frame;
-static void geom_scan_part ARGS((struct geom_info *,
- struct frame *, double));
+static void geom_scan_part(struct geom_info *,
+ struct frame *, double);
/*
* Handle a character in geometric scanning routine.
@@ -2060,10 +2060,10 @@ geom_scan(g_info)
*/
static void
-src_spec_box ARGS((struct geom_info *, long, long, long, long));
+src_spec_box(struct geom_info *, long, long, long, long);
static void
-src_spec_special ARGS((struct geom_info *, const char *));
+src_spec_special(struct geom_info *, const char *);
struct src_parsed_special {
int line;
@@ -2614,10 +2614,10 @@ source_reverse_search(x, y)
*/
static void
-src_spec_show_box ARGS((struct geom_info *, long, long, long, long));
+src_spec_show_box(struct geom_info *, long, long, long, long);
static void
-src_spec_show_special ARGS((struct geom_info *, const char *));
+src_spec_show_special(struct geom_info *, const char *);
struct src_spec_show_data {
Boolean do_this_one; /* flag set after source special */
@@ -2773,10 +2773,10 @@ src_scan_special(str)
}
static void
-src_spec_fwd_box ARGS((struct geom_info *, long, long, long, long));
+src_spec_fwd_box(struct geom_info *, long, long, long, long);
static void
-src_spec_fwd_special ARGS((struct geom_info *, const char *));
+src_spec_fwd_special(struct geom_info *, const char *);
/* ARGSUSED */
static void
diff --git a/events.c b/events.c
@@ -165,7 +165,7 @@ static XColor bg_Color;
#define ACTION_DECL(name) \
- void name ARGS((Widget, XEvent *, String *, Cardinal *))
+ void name(Widget, XEvent *, String *, Cardinal *)
#define ACTION(name) \
void \
@@ -2325,8 +2325,8 @@ ACTION(Act_discard_number)
/* Actions to support the magnifying glass. */
-static void mag_motion ARGS((XEvent *));
-static void mag_release ARGS((XEvent *));
+static void mag_motion(XEvent *);
+static void mag_release(XEvent *);
static void
compute_mag_pos(xp, yp)
@@ -2486,8 +2486,8 @@ movemag(x, y)
static int drag_last_x, drag_last_y; /* last position of cursor */
static int drag_flags; /* 1 = vert, 2 = horiz */
-static void drag_motion ARGS((XEvent *));
-static void drag_release ARGS((XEvent *));
+static void drag_motion(XEvent *);
+static void drag_release(XEvent *);
static
ACTION(Act_drag)
@@ -2853,11 +2853,11 @@ volatile unsigned int sig_flags = 0;
#define SF_CHLD 8
#define SF_TERM 16
-static void do_sigterm ARGS((void));
-static void do_sigchld ARGS((void));
-static void do_sigpoll ARGS((void));
-static void do_sigalrm ARGS((void));
-static void do_sigusr ARGS((void));
+static void do_sigterm(void);
+static void do_sigchld(void);
+static void do_sigpoll(void);
+static void do_sigalrm(void);
+static void do_sigusr(void);
#define SP0 do_sigusr /* these must be in the same order as SF_* */
#define SP1 do_sigalrm
@@ -2865,7 +2865,7 @@ static void do_sigusr ARGS((void));
#define SP3 do_sigchld
#define SP4 do_sigterm /* highest priority */
-typedef void (*signalproc) ARGS((void));
+typedef void (*signalproc)(void);
static const signalproc flags_to_sigproc[32]
= {NULL, SP0, SP1, SP1, SP2, SP2, SP2, SP2,
@@ -3911,7 +3911,7 @@ do_pages()
* eventually stops showing dvips progress until you move the mouse.
*/
-static void xt_alarm ARGS((struct xtimer *));
+static void xt_alarm(struct xtimer *);
static struct xtimer *xt_free_timers = NULL;
diff --git a/filefind.c b/filefind.c
@@ -61,8 +61,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define ST_NLINK_TRICK 1
#endif /* !defined(ST_NLINK_TRICK) */
-extern char *xstrdup ARGS((const char *));
-extern char *xmemdup ARGS((const char *, size_t));
+extern char *xstrdup(const char *);
+extern char *xmemdup(const char *, size_t);
/* These are defined so that the editor can match braces properly. */
#define LBRACE '{'
diff --git a/filefind.h b/filefind.h
@@ -38,9 +38,6 @@ typedef char Boolean;
#define False 0
#endif
-#ifndef ARGS
-#define ARGS(x) x
-#endif
/*
* Record describing how to search for this type of file. Fields are
@@ -81,8 +78,7 @@ struct findrec {
* And now, the star of our show.
*/
-extern FILE *filefind ARGS((const char *, struct findrec *,
- const char **));
+extern FILE *filefind(const char *, struct findrec *, const char **);
/*
* Here are the meanings of the various fields in struct findrec:
@@ -266,4 +262,4 @@ struct envrec {
Boolean flag;
};
-extern struct envrec *ffgetenv ARGS((const char *));
+extern struct envrec *ffgetenv(const char *);
diff --git a/font-open.c b/font-open.c
@@ -691,7 +691,7 @@ struct gs_list { /* list of Fontmap entries for this font name */
static struct avl_gs *gs_head = NULL;
-typedef void (*gs_path_proc) ARGS((FILE *));
+typedef void (*gs_path_proc)(FILE *);
static const char *env_gs_lib;
@@ -1915,7 +1915,7 @@ static struct xtimer mkpk_timer = TIMER_INIT(mkpk_alarm);
* Stuff to handle child process output
*/
-static void mkpk_get_result ARGS((void));
+static void mkpk_get_result(void);
static unsigned int mkpk_pos;
diff --git a/popups.c b/popups.c
@@ -685,13 +685,13 @@ static char filehide = '.';
static const char *file_save_suff = ".dvi";
-static void act_file_go ARGS((Widget, XEvent *, String *, Cardinal *));
-static void act_file_click ARGS((Widget, XEvent *, String *, Cardinal *));
-static void act_file_suffixes ARGS((Widget, XEvent *, String *, Cardinal *));
-static void act_file_scroll ARGS((Widget, XEvent *, String *, Cardinal *));
-static void act_file_arrow ARGS((Widget, XEvent *, String *, Cardinal *));
-static void act_file_home ARGS((Widget, XEvent *, String *, Cardinal *));
-static void act_file_end ARGS((Widget, XEvent *, String *, Cardinal *));
+static void act_file_go(Widget, XEvent *, String *, Cardinal *);
+static void act_file_click(Widget, XEvent *, String *, Cardinal *);
+static void act_file_suffixes(Widget, XEvent *, String *, Cardinal *);
+static void act_file_scroll(Widget, XEvent *, String *, Cardinal *);
+static void act_file_arrow(Widget, XEvent *, String *, Cardinal *);
+static void act_file_home(Widget, XEvent *, String *, Cardinal *);
+static void act_file_end(Widget, XEvent *, String *, Cardinal *);
static XtActionsRec file_actions[] = {
{"file-go", act_file_go},
@@ -2054,11 +2054,11 @@ cb_print(w, client_data, call_data)
print_precheck();
}
-static void print_act_go ARGS((Widget, XEvent *, String *, Cardinal *));
-static void printlog_act_close ARGS((Widget, XEvent *, String *, Cardinal *));
-static void printlog_act_keep ARGS((Widget, XEvent *, String *, Cardinal *));
-static void printlog_act_unkeep ARGS((Widget, XEvent *, String *, Cardinal *));
-static void printlog_act_cancel ARGS((Widget, XEvent *, String *, Cardinal *));
+static void print_act_go(Widget, XEvent *, String *, Cardinal *);
+static void printlog_act_close(Widget, XEvent *, String *, Cardinal *);
+static void printlog_act_keep(Widget, XEvent *, String *, Cardinal *);
+static void printlog_act_unkeep(Widget, XEvent *, String *, Cardinal *);
+static void printlog_act_cancel(Widget, XEvent *, String *, Cardinal *);
static XtActionsRec print_actions[] = {
{"printInternal", print_act_go},
@@ -2587,17 +2587,17 @@ static Widget printlog_cancel;
static XawTextPosition printlog_length;
-static void dvips_ended ARGS((int));
+static void dvips_ended(int);
static struct xchild print_child = {NULL, 0, True, dvips_ended};
-static void read_from_dvips ARGS((void));
+static void read_from_dvips(void);
static struct xio print_xio = {NULL, 0, XIO_IN,
#if HAVE_POLL
NULL,
#endif
read_from_dvips, NULL};
-static void dvips_alarm ARGS((struct xtimer *));
+static void dvips_alarm(struct xtimer *);
static struct xtimer dvips_timer = TIMER_INIT(dvips_alarm);
static int dvips_status;
#define DVIPS_STAT_NONE 0
@@ -2682,11 +2682,11 @@ print_precheck()
}
-static void cb_dvips_close ARGS((Widget, XtPointer, XtPointer));
-static void cb_dvips_keep ARGS((Widget, XtPointer, XtPointer));
-static void cb_dvips_cancel ARGS((Widget, XtPointer, XtPointer));
-static void cb_dvips_delete ARGS((Widget, XtPointer, XtPointer));
-static void printlog_append ARGS((const char *, int));
+static void cb_dvips_close(Widget, XtPointer, XtPointer);
+static void cb_dvips_keep(Widget, XtPointer, XtPointer);
+static void cb_dvips_cancel(Widget, XtPointer, XtPointer);
+static void cb_dvips_delete(Widget, XtPointer, XtPointer);
+static void printlog_append(const char *, int);
struct dvips_env {
const char *envname;
@@ -3010,7 +3010,7 @@ print_do_it()
int fd;
(void) close(0);
- (void) close(fileno(dvi_file));
+ (void) fclose(dvi_file);
fd = open(dvi_name, O_RDONLY);
if (fd < 0) {
perror(dvi_name);
diff --git a/psgs.c b/psgs.c
@@ -66,17 +66,17 @@ extern unsigned psheaderlen;
/* global procedures (besides initGS) */
-static void toggle_gs ARGS((void));
-static void destroy_gs ARGS((void));
-static void interrupt_gs ARGS((void));
-static void endpage_gs ARGS((void));
-static void drawbegin_gs ARGS((int, int, const char *));
-static void drawraw_gs ARGS((const char *));
-static void drawfile_gs ARGS((const char *, FILE *));
-static void drawend_gs ARGS((const char *));
-static void beginheader_gs ARGS((void));
-static void endheader_gs ARGS((void));
-static void newdoc_gs ARGS((void));
+static void toggle_gs (void);
+static void destroy_gs (void);
+static void interrupt_gs (void);
+static void endpage_gs (void);
+static void drawbegin_gs (int, int, const char *);
+static void drawraw_gs (const char *);
+static void drawfile_gs (const char *, FILE *);
+static void drawend_gs (const char *);
+static void beginheader_gs (void);
+static void endheader_gs (void);
+static void newdoc_gs (void);
static struct psprocs gs_procs = {
/* toggle */ toggle_gs,
@@ -138,13 +138,13 @@ static char *linepos = line;
static char ackstr[] = "\347\310\376";
static char oldstr[] = "\347\310\375";
-static void gs_died ARGS((int));
+static void gs_died (int);
static struct xchild gs_child = {NULL, 0, True, gs_died};
#define GS_pid (gs_child.pid)
-static void read_from_gs ARGS((void));
-static void write_to_gs ARGS((void));
+static void read_from_gs(void);
+static void write_to_gs(void);
static struct xio gs_xio = {NULL, 0, XIO_IN,
#if HAVE_POLL
@@ -152,7 +152,7 @@ static struct xio gs_xio = {NULL, 0, XIO_IN,
#endif
read_from_gs, write_to_gs};
-static void gs_alarm ARGS((struct xtimer *));
+static void gs_alarm(struct xtimer *);
static struct xtimer gs_timer = TIMER_INIT(gs_alarm);
diff --git a/special.c b/special.c
@@ -58,8 +58,8 @@ NOTE:
#include <math.h>
#include <ctype.h>
-extern char *strtok ARGS((char *, const char *));
-extern double floor ARGS((double));
+extern char *strtok(char *, const char *);
+extern double floor(double);
#define rint(x) floor((x) + 0.5)
#if PS
@@ -572,10 +572,10 @@ static struct findrec search_fig = {
}
};
-static void ps_startup ARGS((int, int, const char *));
-static void ps_startup2 ARGS((void));
-void NullProc ARGS((void)) {}
-static void NullProc2 ARGS((const char *));
+static void ps_startup(int, int, const char *);
+static void ps_startup2(void);
+void NullProc(void) {}
+static void NullProc2(const char *);
struct psprocs psp = { /* used for lazy startup of the ps machinery */
/* toggle */ NullProc,
diff --git a/util.c b/util.c
@@ -810,9 +810,9 @@ property_get_data(w, a, ret_buf, x_get_property)
Window w;
Atom a;
unsigned char **ret_buf;
- int (*x_get_property) ARGS((Display *, Window, Atom, long,
+ int (*x_get_property) (Display *, Window, Atom, long,
long, Bool, Atom, Atom *, int *, unsigned long *,
- unsigned long *, unsigned char **));
+ unsigned long *, unsigned char **);
{
/* all of these are in 8-bit units */
unsigned long byte_offset = 0;
diff --git a/xdvi.c b/xdvi.c
@@ -1019,7 +1019,7 @@ static int XdviErrorHandler P2H(Display *, XErrorEvent *);
static unsigned long xdvi_next_request = 0;
static int xerrno;
-static int (*XdviOldErrorHandler) ARGS((Display *, XErrorEvent *));
+static int (*XdviOldErrorHandler)(Display *, XErrorEvent *);
static int
XdviErrorHandler(d, event)
diff --git a/xdvi.h b/xdvi.h
@@ -89,9 +89,6 @@ typedef char Bool3; /* Yes/No/Maybe */
# include FT_FREETYPE_H
#endif
-/* NeedFunctionPrototypes */
-#define ARGS(x) x
-
#ifndef KPATHSEA
/* These macros munge function declarations to make them work in both
@@ -172,12 +169,12 @@ struct frame {
};
#ifndef TEXXET
-typedef long (*set_char_proc) ARGS((wide_ubyte));
+typedef long (*set_char_proc)(wide_ubyte);
#else
-typedef void (*set_char_proc) ARGS((wide_ubyte, wide_ubyte));
+typedef void (*set_char_proc)(wide_ubyte, wide_ubyte);
#endif
-typedef void (*home_proc) ARGS((wide_bool));
+typedef void (*home_proc)(wide_bool);
struct drawinf { /* this information is saved when using virtual fonts */
struct framedata data;
@@ -349,7 +346,7 @@ struct macro {
#define NOMAGSTP (-29999)
-typedef void (*read_char_proc) ARGS((struct font *, wide_ubyte));
+typedef void (*read_char_proc)(struct font *, wide_ubyte);
struct font {
struct font *next; /* link to next font info block */
@@ -718,7 +715,7 @@ struct xchild {
struct xchild *next; /* link to next in list */
pid_t pid; /* pid of process, or 0 */
Boolean killable; /* if can be killed with SIGKILL */
- void (*proc) ARGS((int)); /* procedure to call */
+ void (*proc)(int); /* procedure to call */
};
struct xio {
@@ -730,14 +727,14 @@ struct xio {
#if HAVE_POLL
struct pollfd *pfd;
#endif
- void (*read_proc) ARGS((void)); /* call to read */
- void (*write_proc) ARGS((void)); /* call to write */
+ void (*read_proc)(void); /* call to read */
+ void (*write_proc)(void); /* call to write */
};
struct xtimer {
struct xtimer *next; /* link to next in chain */
struct timeval when; /* when to call the routine */
- void (*proc) ARGS((struct xtimer *)); /* procedure to call */
+ void (*proc)(struct xtimer *); /* procedure to call */
#if MOTIF_TIMERS
XtTimerCallbackProc xt_proc; /* additional data for Xm */
XtPointer closure;
@@ -870,15 +867,14 @@ struct avl_enc {
*/
struct geom_info {
- void (*geom_box) ARGS((struct geom_info *,
- long, long, long, long));
- void (*geom_special) ARGS((struct geom_info *, const char *));
+ void (*geom_box) (struct geom_info *, long, long, long, long);
+ void (*geom_special) (struct geom_info *, const char *);
jmp_buf done_env;
void *geom_data;
};
-typedef void (*mouse_proc) ARGS((XEvent *));
-extern void null_mouse ARGS((XEvent *));
+typedef void (*mouse_proc) (XEvent *);
+extern void null_mouse (XEvent *);
mouse_proc mouse_motion = null_mouse;
mouse_proc mouse_release = null_mouse;
@@ -901,17 +897,17 @@ const char *argv0; /* argv[0] */
#if PS
extern struct psprocs {
- void (*toggle) ARGS((void));
- void (*destroy) ARGS((void));
- void (*interrupt) ARGS((void));
- void (*endpage) ARGS((void));
- void (*drawbegin) ARGS((int, int, const char *));
- void (*drawraw) ARGS((const char *));
- void (*drawfile) ARGS((const char *, FILE *));
- void (*drawend) ARGS((const char *));
- void (*beginheader) ARGS((void));
- void (*endheader) ARGS((void));
- void (*newdoc) ARGS((void));
+ void (*toggle) (void);
+ void (*destroy) (void);
+ void (*interrupt) (void);
+ void (*endpage) (void);
+ void (*drawbegin) (int, int, const char *);
+ void (*drawraw) (const char *);
+ void (*drawfile) (const char *, FILE *);
+ void (*drawend) (const char *);
+ void (*beginheader) (void);
+ void (*endheader) (void);
+ void (*newdoc) (void);
} psp, no_ps_procs;
#endif /* PS */
@@ -922,168 +918,164 @@ extern struct psprocs {
_XFUNCPROTOBEGIN
-extern int atopix ARGS((const char *, wide_bool));
-extern Bool compile_action ARGS((const char *, struct xdvi_action **));
+extern int atopix(const char *, wide_bool);
+extern Bool compile_action(const char *, struct xdvi_action **);
#if BUTTONS
-extern void create_buttons ARGS((void));
-extern void set_button_panel_height ARGS((XtArgVal));
+extern void create_buttons(void);
+extern void set_button_panel_height(XtArgVal);
#endif /* BUTTONS */
#if GREY
-extern void init_plane_masks ARGS((void));
+extern void init_plane_masks(void);
#endif
#if COLOR
-extern Pixel alloc_color ARGS((const struct rgb *, Pixel));
-extern void do_color_change ARGS((void));
+extern Pixel alloc_color(const struct rgb *, Pixel);
+extern void do_color_change(void);
#elif GREY
-extern void init_pix ARGS((void));
+extern void init_pix(void);
#endif
-extern void expose ARGS((struct WindowRec *, int, int,
- unsigned int, unsigned int));
-extern void home ARGS((wide_bool));
-extern void reconfig ARGS((void));
-extern void handle_resize ARGS((Widget, XtPointer, XEvent *, Boolean *));
-extern void handle_expose ARGS((Widget, XtPointer, XEvent *, Boolean *));
-extern void handle_property_change ARGS((Widget, XtPointer, XEvent *,
- Boolean *));
-extern void handle_messages ARGS((Widget, XtPointer, XEvent *, Boolean *));
-extern void goto_page ARGS((int, home_proc));
-extern void set_chld ARGS((struct xchild *));
-extern void clear_chld ARGS((struct xchild *));
-extern void set_io ARGS((struct xio *));
-extern void clear_io ARGS((struct xio *));
-extern void set_timer ARGS((struct xtimer *, int));
-extern void cancel_timer ARGS((struct xtimer *));
-extern unsigned int read_events ARGS((unsigned int));
-extern void enable_intr ARGS((void));
-extern void do_pages ARGS((void)) NORETURN;
-extern void simple_popup ARGS((struct status_popup *, const char *,
- XtCallbackProc));
-extern void simple_popdown ARGS((struct status_popup *));
-extern void do_popup ARGS((Widget));
-extern Widget warning_popup ARGS((const char *, const char *,
- XtCallbackProc));
+extern void expose(struct WindowRec *, int, int, unsigned int,
+ unsigned int);
+extern void home(wide_bool);
+extern void reconfig(void);
+extern void handle_resize(Widget, XtPointer, XEvent *, Boolean *);
+extern void handle_expose(Widget, XtPointer, XEvent *, Boolean *);
+extern void handle_property_change(Widget, XtPointer, XEvent *, Boolean *);
+extern void handle_messages(Widget, XtPointer, XEvent *, Boolean *);
+extern void goto_page(int, home_proc);
+extern void set_chld(struct xchild *);
+extern void clear_chld(struct xchild *);
+extern void set_io(struct xio *);
+extern void clear_io(struct xio *);
+extern void set_timer(struct xtimer *, int);
+extern void cancel_timer(struct xtimer *);
+extern unsigned int read_events(unsigned int);
+extern void enable_intr(void);
+extern void do_pages(void) NORETURN;
+extern void simple_popup(struct status_popup *, const char *,
+ XtCallbackProc);
+extern void simple_popdown(struct status_popup *);
+extern void do_popup(Widget);
+extern Widget warning_popup(const char *, const char *, XtCallbackProc);
extern Widget warning_popup_long(const char *, const char *,
XtCallbackProc, ...);
-extern void Act_print ARGS((Widget, XEvent *, String *, Cardinal *));
-extern void Act_open_dvi_file ARGS((Widget, XEvent *, String *,
- Cardinal *));
-extern void reset_fonts ARGS((void));
+extern void Act_print(Widget, XEvent *, String *, Cardinal *);
+extern void Act_open_dvi_file(Widget, XEvent *, String *, Cardinal *);
+extern void reset_fonts(void);
#if COLOR
-extern void reset_colors ARGS((void));
-extern void full_reset_colors ARGS((void));
+extern void reset_colors(void);
+extern void full_reset_colors(void);
#endif
-extern void realloc_font ARGS((struct font *, wide_ubyte));
-extern void realloc_virtual_font ARGS((struct font *, wide_ubyte));
-extern Boolean load_font ARGS((struct font *));
-extern struct font *define_font ARGS((FILE *, wide_ubyte,
+extern void realloc_font(struct font *, wide_ubyte);
+extern void realloc_virtual_font(struct font *, wide_ubyte);
+extern Boolean load_font(struct font *);
+extern struct font *define_font(FILE *, wide_ubyte,
struct font *, struct font **, unsigned int,
- struct tn **));
-extern void init_page ARGS((void));
-extern Boolean open_dvi_file ARGS((const char *));
-extern void form_dvi_property ARGS((ino_t));
-extern void init_dvi_file ARGS((void));
-extern void set_dvi_property ARGS((void));
-extern Boolean check_dvi_file ARGS((void));
-extern void reload_dvi_file ARGS((void));
+ struct tn **);
+extern void init_page(void);
+extern Boolean open_dvi_file(const char *);
+extern void form_dvi_property(ino_t);
+extern void init_dvi_file(void);
+extern void set_dvi_property(void);
+extern Boolean check_dvi_file(void);
+extern void reload_dvi_file(void);
#ifndef TEXXET
-extern long set_char ARGS((wide_ubyte));
-extern long load_n_set_char ARGS((wide_ubyte));
-extern long set_vf_char ARGS((wide_ubyte));
+extern long set_char(wide_ubyte);
+extern long load_n_set_char(wide_ubyte);
+extern long set_vf_char(wide_ubyte);
# if FREETYPE
-extern long set_ft_char ARGS((wide_ubyte));
+extern long set_ft_char(wide_ubyte);
# endif
#else
-extern void set_char ARGS((wide_ubyte, wide_ubyte));
-extern void load_n_set_char ARGS((wide_ubyte, wide_ubyte));
-extern void set_vf_char ARGS((wide_ubyte, wide_ubyte));
+extern void set_char(wide_ubyte, wide_ubyte);
+extern void load_n_set_char(wide_ubyte, wide_ubyte);
+extern void set_vf_char(wide_ubyte, wide_ubyte);
# if FREETYPE
-extern long set_ft_char ARGS((wide_ubyte, wide_ubyte));
+extern long set_ft_char(wide_ubyte, wide_ubyte);
# endif
#endif
-extern void open_font_file ARGS((struct font *));
-extern void prescan ARGS((void));
-extern void draw_page ARGS((void));
-extern void source_reverse_search ARGS((int, int));
-extern void source_special_show ARGS((wide_bool));
-extern void source_forward_search ARGS((const char *));
+extern void open_font_file(struct font *);
+extern void prescan(void);
+extern void draw_page(void);
+extern void source_reverse_search(int, int);
+extern void source_special_show(wide_bool);
+extern void source_forward_search(const char *);
#if CFGFILE
-extern void readconfig ARGS((void));
+extern void readconfig(void);
#endif
#if FREETYPE || PS
-extern FILE *open_t1_font ARGS((struct avl_t1 *, const char **));
-extern void read_encoding ARGS((struct avl_enc *));
+extern FILE *open_t1_font(struct avl_t1 *, const char **);
+extern void read_encoding(struct avl_enc *);
#endif
-extern void init_font_open ARGS((void));
-extern Boolean font_open ARGS((struct font *, char **, int *));
+extern void init_font_open(void);
+extern Boolean font_open(struct font *, char **, int *);
#if PS
-extern void ps_clear_cache ARGS((void));
-extern void ps_destroy ARGS((void));
+extern void ps_clear_cache(void);
+extern void ps_destroy(void);
#endif
-extern void init_prescan ARGS((void));
+extern void init_prescan(void);
#if COLOR
-extern void scan_color_eop ARGS((void));
-extern void set_fg_color ARGS((const struct rgb *));
+extern void scan_color_eop(void);
+extern void set_fg_color(const struct rgb *);
#endif
-extern void applicationDoSpecial ARGS((char *));
-extern void scan_special ARGS((char *));
-extern void geom_do_special ARGS((struct geom_info *, char *, double));
-extern void xdvi_exit ARGS((int)) NORETURN;
+extern void applicationDoSpecial(char *);
+extern void scan_special(char *);
+extern void geom_do_special(struct geom_info *, char *, double);
+extern void xdvi_exit(int) NORETURN;
extern void oops(const char *, ...) NORETURN;
#ifndef KPATHSEA
-extern void *xmalloc ARGS((unsigned));
-extern void *xrealloc ARGS((void *, unsigned));
-extern char *xstrdup ARGS((const char *));
-extern char *xmemdup ARGS((const char *, size_t));
+extern void *xmalloc(unsigned);
+extern void *xrealloc(void *, unsigned);
+extern char *xstrdup(const char *);
+extern char *xmemdup(const char *, size_t);
#endif
#if !HAVE_STRERROR && !defined strerror
-extern char *strerror ARGS((int));
+extern char *strerror(int);
#endif
-extern void expandline ARGS((size_t));
-extern void alloc_bitmap ARGS((struct bitmap *));
+extern void expandline(size_t);
+extern void alloc_bitmap(struct bitmap *);
#ifndef KPATHSEA
-extern void xputenv ARGS((const char *, const char *));
+extern void xputenv(const char *, const char *);
#endif
-extern int memicmp ARGS((const char *, const char *, size_t));
-extern FILE *xfopen ARGS((const char *, const char *));
-extern int xopen ARGS((const char *, int));
-extern int xpipe ARGS((int *));
-extern DIR *xopendir ARGS((const char *));
-extern const struct passwd *ff_getpw ARGS((const char **, const char *));
-extern unsigned long num ARGS((FILE *, int));
-extern long snum ARGS((FILE *, int));
+extern int memicmp(const char *, const char *, size_t);
+extern FILE *xfopen(const char *, const char *);
+extern int xopen(const char *, int);
+extern int xpipe(int *);
+extern DIR *xopendir(const char *);
+extern const struct passwd *ff_getpw(const char **, const char *);
+extern unsigned long num(FILE *, int);
+extern long snum(FILE *, int);
#if FREETYPE || PS
-extern struct avl *avladd ARGS((const char *, size_t, struct avl **,
- size_t));
+extern struct avl *avladd(const char *, size_t, struct avl **, size_t);
#endif
-extern size_t property_get_data ARGS((Window, Atom, unsigned char **,
+extern size_t property_get_data(Window, Atom, unsigned char **,
int (*x_get_property) (Display *, Window, Atom, long,
long, Bool, Atom, Atom *, int *, unsigned long *,
- unsigned long *, unsigned char **)));
+ unsigned long *, unsigned char **));
#if PS
-extern int xdvi_temp_fd ARGS((char **));
+extern int xdvi_temp_fd(char **);
#endif
-extern void prep_fd ARGS((int, wide_bool));
-extern void read_PK_index ARGS((struct font *, wide_bool));
-extern void read_GF_index ARGS((struct font *, wide_bool));
-extern void read_VF_index ARGS((struct font *, wide_bool));
+extern void prep_fd(int, wide_bool);
+extern void read_PK_index(struct font *, wide_bool);
+extern void read_GF_index(struct font *, wide_bool);
+extern void read_VF_index(struct font *, wide_bool);
#if FREETYPE
-extern Boolean load_ft_font ARGS((struct font *));
+extern Boolean load_ft_font(struct font *);
#endif
#if PS
-extern void ps_init_paths ARGS((void));
-extern void drawbegin_none ARGS((int, int, const char *));
-extern void draw_bbox ARGS((void));
-extern void NullProc ARGS((void));
+extern void ps_init_paths(void);
+extern void drawbegin_none(int, int, const char *);
+extern void draw_bbox(void);
+extern void NullProc(void);
#ifdef PS_DPS
-extern Boolean initDPS ARGS((void));
+extern Boolean initDPS(void);
#endif
#ifdef PS_NEWS
-extern Boolean initNeWS ARGS((void));
+extern Boolean initNeWS(void);
#endif
#ifdef PS_GS
-extern Boolean initGS ARGS((void));
-extern void gs_resume_prescan ARGS((void));
+extern Boolean initGS(void);
+extern void gs_resume_prescan(void);
#endif
#endif /* PS */
