From b6bb24fcedc452e15526782348ff31e73e7a1a05 Mon Sep 17 00:00:00 2001 From: obrien Date: Sun, 14 Nov 1999 00:41:54 +0000 Subject: Enter complier upgrade mode again. We need to cut 169 bytes from this: Remove some printf() calls, reduce size of buffers, and abbreviate some strings. Hopefully the boot people will fix this spamage after the cut over to Gcc 2.95.2 as the system compiler. --- sys/boot/i386/boot2/boot2.c | 16 ++++++++-------- sys/boot/i386/gptboot/gptboot.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index eefcf08..503c10c 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -100,8 +100,8 @@ static struct dsk { int init; int meta; } dsk; -static char cmd[512]; -static char kname[1024]; +static char cmd[80]; +static char kname[128]; static uint32_t opts; static struct bootinfo bootinfo; static int ls; @@ -170,9 +170,9 @@ main(void) memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } for (;;) { - printf(" \n>> FreeBSD/i386 BOOT\n" - "Default: %u:%s(%u,%c)%s\n" - "boot: ", + printf( /* " \n>> FreeBSD/i386 BOOT\n" */ + /* "Default: */ "%u:%s(%u,%c)%s:", + /* "boot: ", */ dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, 'a' + dsk.part, kname); if (ioctrl & 0x2) @@ -209,8 +209,8 @@ load(const char *fname) int fmt, i, j; if (!(ino = lookup(fname))) { - if (!ls) - printf("No %s\n", fname); + /* if (!ls) + printf("No %s\n", fname); */ return; } if (xfsread(ino, &hdr, sizeof(hdr))) @@ -310,7 +310,7 @@ parse(char *arg) } if (opts & 1 << RBX_PROBEKBD) { i = *(uint8_t *)PTOV(0x496) & 0x10; - printf("Keyboard: %s\n", i ? "yes" : "no"); + /* printf("Keyboard: %s\n", i ? "yes" : "no"); */ if (!i) opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index eefcf08..503c10c 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -100,8 +100,8 @@ static struct dsk { int init; int meta; } dsk; -static char cmd[512]; -static char kname[1024]; +static char cmd[80]; +static char kname[128]; static uint32_t opts; static struct bootinfo bootinfo; static int ls; @@ -170,9 +170,9 @@ main(void) memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } for (;;) { - printf(" \n>> FreeBSD/i386 BOOT\n" - "Default: %u:%s(%u,%c)%s\n" - "boot: ", + printf( /* " \n>> FreeBSD/i386 BOOT\n" */ + /* "Default: */ "%u:%s(%u,%c)%s:", + /* "boot: ", */ dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, 'a' + dsk.part, kname); if (ioctrl & 0x2) @@ -209,8 +209,8 @@ load(const char *fname) int fmt, i, j; if (!(ino = lookup(fname))) { - if (!ls) - printf("No %s\n", fname); + /* if (!ls) + printf("No %s\n", fname); */ return; } if (xfsread(ino, &hdr, sizeof(hdr))) @@ -310,7 +310,7 @@ parse(char *arg) } if (opts & 1 << RBX_PROBEKBD) { i = *(uint8_t *)PTOV(0x496) & 0x10; - printf("Keyboard: %s\n", i ? "yes" : "no"); + /* printf("Keyboard: %s\n", i ? "yes" : "no"); */ if (!i) opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); -- cgit v1.1