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 /output/outaout.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 'output/outaout.c')
| -rw-r--r-- | output/outaout.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/output/outaout.c b/output/outaout.c index 0b3c7ca..8bff63e 100644 --- a/output/outaout.c +++ b/output/outaout.c @@ -198,20 +198,15 @@ static void aoutb_init(void) is_pic = 0x00; /* may become 0x40 */ aout_gotpc_sect = seg_alloc(); - define_label("..gotpc", aout_gotpc_sect + 1, 0L, NULL, false, false, &of_aoutb, - nasm_error); + define_label("..gotpc", aout_gotpc_sect + 1, 0L, NULL, false, false); aout_gotoff_sect = seg_alloc(); - define_label("..gotoff", aout_gotoff_sect + 1, 0L, NULL, false, false, - &of_aoutb, nasm_error); + define_label("..gotoff", aout_gotoff_sect + 1, 0L, NULL, false, false); aout_got_sect = seg_alloc(); - define_label("..got", aout_got_sect + 1, 0L, NULL, false, false, &of_aoutb, - nasm_error); + define_label("..got", aout_got_sect + 1, 0L, NULL, false, false); aout_plt_sect = seg_alloc(); - define_label("..plt", aout_plt_sect + 1, 0L, NULL, false, false, &of_aoutb, - nasm_error); + define_label("..plt", aout_plt_sect + 1, 0L, NULL, false, false); aout_sym_sect = seg_alloc(); - define_label("..sym", aout_sym_sect + 1, 0L, NULL, false, false, &of_aoutb, - nasm_error); + define_label("..sym", aout_sym_sect + 1, 0L, NULL, false, false); } #endif |