diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-07-18 18:31:41 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-18 18:43:58 -0700 |
commit | 605f5155eeedea126c4fe4f2387e7a3da0fc3063 (patch) | |
tree | 9d747371d33bc82c51ec76fe63dc370dd7e9ffe5 /parser.c | |
parent | ab6443969a57014b4261f1b8a2b9c2ab1224e149 (diff) | |
download | nasm-605f5155eeedea126c4fe4f2387e7a3da0fc3063.tar.gz nasm-605f5155eeedea126c4fe4f2387e7a3da0fc3063.tar.bz2 nasm-605f5155eeedea126c4fe4f2387e7a3da0fc3063.zip |
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 <hpa@zytor.com>
Diffstat (limited to 'parser.c')
-rw-r--r-- | parser.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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); } } |