From deccbb07e9cf397b3be680dc74a75b778d817331 Mon Sep 17 00:00:00 2001 From: bentley Date: Fri, 15 Jan 2010 13:05:16 -0700 Subject: [PATCH] rgblink: remove random option for fill character --- src/link/main.c | 16 ++++++---------- src/link/output.c | 8 ++------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/link/main.c b/src/link/main.c index 57a73980..aedc9470 100644 --- a/src/link/main.c +++ b/src/link/main.c @@ -29,7 +29,7 @@ enum eBlockType { }; SLONG options = 0; -SLONG fillchar = 0; +SLONG fillchar; char smartlinkstartsymbol[256]; /* @@ -142,15 +142,11 @@ main(int argc, char *argv[]) options |= OPT_SMALL; break; case 'z': - if (optarg[0] == '?') - fillchar = -1; - else { - fillchar = strtoul(optarg, &ep, 0); - if (optarg[0] == '\0' || *ep != '\0') - errx(EX_USAGE, "Invalid argument for option 'z'"); - if (fillchar < 0 || fillchar > 0xFF) - errx(EX_USAGE, "Argument for option 'z' must be between 0 and 0xFF"); - } + fillchar = strtoul(optarg, &ep, 0); + if (optarg[0] == '\0' || *ep != '\0') + errx(EX_USAGE, "Invalid argument for option 'z'"); + if (fillchar < 0 || fillchar > 0xFF) + errx(EX_USAGE, "Argument for option 'z' must be between 0 and 0xFF"); break; default: usage(); diff --git a/src/link/output.c b/src/link/output.c index cac431e5..248e3c65 100644 --- a/src/link/output.c +++ b/src/link/output.c @@ -20,9 +20,7 @@ writehome(FILE * f) if (!mem) return; - if (fillchar != -1) { - memset(mem, fillchar, MaxAvail[BANK_HOME]); - } + memset(mem, fillchar, MaxAvail[BANK_HOME]); MapfileInitBank(0); pSect = pSections; @@ -51,9 +49,7 @@ writebank(FILE * f, SLONG bank) if (!mem) return; - if (fillchar != -1) { - memset(mem, fillchar, MaxAvail[bank]); - } + memset(mem, fillchar, MaxAvail[bank]); MapfileInitBank(bank); pSect = pSections;