summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2015-06-27 08:49:41 +0000
committernyan <nyan@FreeBSD.org>2015-06-27 08:49:41 +0000
commit866ebd44e6d8df3df187763cc5d63d09a22fdddb (patch)
treee59075caecf80739bb88372f84b1524b781a6e06 /sys/boot
parent6bdaeb3df58cdde4a0937dd4077c27c1af79aa5b (diff)
downloadFreeBSD-src-866ebd44e6d8df3df187763cc5d63d09a22fdddb.zip
FreeBSD-src-866ebd44e6d8df3df187763cc5d63d09a22fdddb.tar.gz
MFi386: r284878
Reduce warnings: - Add prototype for boot2 main() - Don't make assignment within if statement, split it into two.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/pc98/boot2/boot2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/boot/pc98/boot2/boot2.c b/sys/boot/pc98/boot2/boot2.c
index 0f17589..83af085 100644
--- a/sys/boot/pc98/boot2/boot2.c
+++ b/sys/boot/pc98/boot2/boot2.c
@@ -152,6 +152,7 @@ static int comspeed = SIOSPD;
static uint8_t ioctrl = IO_KEYBOARD;
#endif
+int main(void);
void exit(int);
static void load(void);
static int parse(void);
@@ -620,7 +621,8 @@ parse()
dsk.daua = dsk.disk | dsk.unit;
dsk_meta = 0;
}
- if (k = ep - arg) {
+ k = ep - arg;
+ if (k > 0) {
if (k >= sizeof(knamebuf))
return -1;
memcpy(knamebuf, arg, k + 1);
OpenPOWER on IntegriCloud