From 48fd34c923d3f785ed41186732eb2d7cbf8d195c Mon Sep 17 00:00:00 2001
From: bentley <anthonyjbentley@gmail.com>
Date: Fri, 15 Jan 2010 17:04:34 -0700
Subject: [PATCH] rgbasm: remove option for random fill character

---
 src/asm/main.c   | 18 +++++++-----------
 src/asm/output.c |  3 +--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/asm/main.c b/src/asm/main.c
index 556f13d0..7ee90c73 100644
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -151,17 +151,13 @@ opt_Parse(char *s)
 		break;
 	case 'z':
 		if (strlen(&s[1]) <= 2) {
-			if (strcmp(&s[1], "?") == 0) {
-				newopt.fillchar = -1;
-			} else {
-				int result;
+			int result;
 
-				result = sscanf(&s[1], "%lx", &newopt.fillchar);
-				if (!((result == EOF) || (result == 1))) {
-					printf
-					    ("*ERROR*\t :\n\tInvalid argument for option 'z'\n");
-					exit(5);
-				}
+			result = sscanf(&s[1], "%lx", &newopt.fillchar);
+			if (!((result == EOF) || (result == 1))) {
+				printf
+				    ("*ERROR*\t :\n\tInvalid argument for option 'z'\n");
+				exit(5);
 			}
 		} else {
 			printf
@@ -280,7 +276,7 @@ main(int argc, char *argv[])
 	DefaultOptions.gbgfx[3] = '3';
 	DefaultOptions.binary[0] = '0';
 	DefaultOptions.binary[1] = '1';
-	DefaultOptions.fillchar = 0; // -1 => fill uninitialized data with random values
+	DefaultOptions.fillchar = 0;
 	    opt_SetCurrentOptions(&DefaultOptions);
 
 	while (argv[argn][0] == '-' && argc) {
diff --git a/src/asm/output.c b/src/asm/output.c
index 0579cb02..c304b1ae 100644
--- a/src/asm/output.c
+++ b/src/asm/output.c
@@ -724,8 +724,7 @@ void
 out_Skip(int skip)
 {
 	checksection();
-	if ((CurrentOptions.fillchar == -1)
-	    || !((pCurrentSection->nType == SECT_HOME)
+	if (!((pCurrentSection->nType == SECT_HOME)
 		|| (pCurrentSection->nType == SECT_CODE))) {
 		pCurrentSection->nPC += skip;
 		nPC += skip;