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>

1 files changed, 4 insertions, 7 deletions

diff --git a/labels.h b/labels.h
index 59e83ba0..865a5571 100644
--- a/labels.h
+++ b/labels.h
@@ -44,14 +44,11 @@ extern char lpostfix[PREFIX_MAX];
 bool lookup_label(char *label, int32_t *segment, int64_t *offset);
 bool is_extern(char *label);
 void define_label(char *label, int32_t segment, int64_t offset, char *special,
-		  bool is_norm, bool isextrn, struct ofmt *ofmt,
-                  efunc error);
+		  bool is_norm, bool isextrn);
 void redefine_label(char *label, int32_t segment, int64_t offset, char *special,
-                    bool is_norm, bool isextrn, struct ofmt *ofmt,
-                    efunc error);
-void define_common(char *label, int32_t segment, int32_t size, char *special,
-                   struct ofmt *ofmt, efunc error);
-void declare_as_global(char *label, char *special, efunc error);
+                    bool is_norm, bool isextrn);
+void define_common(char *label, int32_t segment, int32_t size, char *special);
+void declare_as_global(char *label, char *special);
 int init_labels(void);
 void cleanup_labels(void);
 char *local_scope(char *label);