summaryrefslogtreecommitdiff
path: root/output
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2019-09-12 20:26:23 -0400
committerH. Peter Anvin <hpa@zytor.com>2019-09-12 20:26:23 -0400
commit7ad25b2e1828a4569812f3296473f7a3bc7cd941 (patch)
tree2588114d21407401b7e57092469edec92ed91f20 /output
parent90b1ccff86d530b140eb391ede3c50e33bcf9410 (diff)
downloadnasm-7ad25b2e1828a4569812f3296473f7a3bc7cd941.tar.gz
Change LBL_NONE to LBL_none
NASM convention is to use all-upper-case for "real" information, and mixed-case (upper case common prefix, lower case description) for meta-information. This is a highly useful distinction. Thus "LBL_NONE" implies an actual label of type "NONE", as opposed to no label at all. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'output')
-rw-r--r--output/outbin.c4
-rw-r--r--output/outmacho.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/output/outbin.c b/output/outbin.c
index 5c2f0631..29659f00 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -655,7 +655,7 @@ static void bin_cleanup(void)
fprintf(rf, "\n\nValue Name\n");
list_for_each(l, no_seg_labels) {
found_label = lookup_label(l->name, &segment, &offset);
- nasm_assert(found_label != LBL_NONE);
+ nasm_assert(found_label != LBL_none);
fprintf(rf, "%08"PRIX64" %s\n", offset, l->name);
}
fprintf(rf, "\n\n");
@@ -668,7 +668,7 @@ static void bin_cleanup(void)
fprintf(rf, "\n\nReal Virtual Name\n");
list_for_each(l, s->labels) {
found_label = lookup_label(l->name, &segment, &offset);
- nasm_assert(found_label != LBL_NONE);
+ nasm_assert(found_label != LBL_none);
fprintf(rf, "%16"PRIX64" %16"PRIX64" %s\n",
s->start + offset, s->vstart + offset,
l->name);
diff --git a/output/outmacho.c b/output/outmacho.c
index 6cbaa012..08147883 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -1740,7 +1740,7 @@ static bool macho_set_section_attribute_by_symbol(const char *label, uint32_t fl
int32_t nasm_seg;
int64_t offset;
- if (lookup_label(label, &nasm_seg, &offset) == LBL_NONE) {
+ if (lookup_label(label, &nasm_seg, &offset) == LBL_none) {
nasm_error(ERR_NONFATAL, "unknown symbol `%s' in no_dead_strip", label);
return false;
}