From owner-svn-src-all@freebsd.org  Sat Jun 27 08:49:42 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 974D598C27A;
 Sat, 27 Jun 2015 08:49:42 +0000 (UTC)
 (envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 884F11DE2;
 Sat, 27 Jun 2015 08:49:42 +0000 (UTC)
 (envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5R8ngoV024776;
 Sat, 27 Jun 2015 08:49:42 GMT (envelope-from nyan@FreeBSD.org)
Received: (from nyan@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5R8ng6c024775;
 Sat, 27 Jun 2015 08:49:42 GMT (envelope-from nyan@FreeBSD.org)
Message-Id: <201506270849.t5R8ng6c024775@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: nyan set sender to nyan@FreeBSD.org
 using -f
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Sat, 27 Jun 2015 08:49:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284885 - head/sys/boot/pc98/boot2
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Jun 2015 08:49:42 -0000

Author: nyan
Date: Sat Jun 27 08:49:41 2015
New Revision: 284885
URL: https://svnweb.freebsd.org/changeset/base/284885

Log:
  MFi386: r284878
  
    Reduce warnings:
  
     - Add prototype for boot2 main()
     - Don't make assignment within if statement, split it into two.

Modified:
  head/sys/boot/pc98/boot2/boot2.c

Modified: head/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- head/sys/boot/pc98/boot2/boot2.c	Sat Jun 27 05:18:08 2015	(r284884)
+++ head/sys/boot/pc98/boot2/boot2.c	Sat Jun 27 08:49:41 2015	(r284885)
@@ -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);