From 605f5155eeedea126c4fe4f2387e7a3da0fc3063 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sat, 18 Jul 2009 18:31:41 -0700 Subject: Drop the ofmt and errfunc arguments to label definition functions We never set ofmt and errfunc to anything but the global values. Dropping them from the label definition function command line simplifies the code. Signed-off-by: H. Peter Anvin --- parser.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'parser.c') diff --git a/parser.c b/parser.c index 79da3729..9b9e89ac 100644 --- a/parser.c +++ b/parser.c @@ -61,12 +61,10 @@ static int is_comma_next(void); static int i; static struct tokenval tokval; static efunc error; -static struct ofmt *outfmt; /* Structure of addresses of output routines */ static struct location *location; /* Pointer to current line's segment,offset */ -void parser_global_info(struct ofmt *output, struct location * locp) +void parser_global_info(struct location * locp) { - outfmt = output; location = locp; } @@ -248,7 +246,7 @@ restart_parse: * am still not certain. */ ldef(result->label, in_abs_seg ? abs_seg : location->segment, - location->offset, NULL, true, false, outfmt, errfunc); + location->offset, NULL, true, false); } } -- cgit v1.2.1