Additional uses of bool and enum

Proper use of bool and enum makes code easier to debug.  Do more of
it.  In particular, we really should stomp out any residual uses of
magic constants that aren't enums or, in some cases, even #defines.

1 files changed, 9 insertions, 4 deletions

diff --git a/labels.h b/labels.h
index 91232dd..327fb0f 100644
--- a/labels.h
+++ b/labels.h
@@ -6,19 +6,24 @@
  * distributed in the NASM archive.
  */
 
+#ifndef LABELS_H
+#define LABELS_H
+
 extern char lprefix[PREFIX_MAX];
 extern char lpostfix[PREFIX_MAX];
 
-int lookup_label(char *label, int32_t *segment, int32_t *offset);
-int is_extern(char *label);
+bool lookup_label(char *label, int32_t *segment, int32_t *offset);
+bool is_extern(char *label);
 void define_label(char *label, int32_t segment, int32_t offset, char *special,
-                  int is_norm, int isextrn, struct ofmt *ofmt,
+		  bool is_norm, bool isextrn, struct ofmt *ofmt,
                   efunc error);
 void redefine_label(char *label, int32_t segment, int32_t offset, char *special,
-                    int is_norm, int isextrn, struct ofmt *ofmt,
+                    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);
 int init_labels(void);
 void cleanup_labels(void);
+
+#endif /* LABELS_H */