From owner-freebsd-i386@FreeBSD.ORG  Fri Mar  5 05:41:54 2004
Return-Path: <owner-freebsd-i386@FreeBSD.ORG>
Delivered-To: freebsd-i386@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6754B16A4CE; Fri,  5 Mar 2004 05:41:54 -0800 (PST)
Received: from fafoe.narf.at (unknown [212.186.3.235])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0DFDC43D2D; Fri,  5 Mar 2004 05:41:54 -0800 (PST)
	(envelope-from stefan@fafoe.narf.at)
Received: from wombat.fafoe.narf.at (wombat.fafoe.narf.at [192.168.1.42])
	by fafoe.narf.at (Postfix) with ESMTP
	id 117B740B6; Fri,  5 Mar 2004 14:41:48 +0100 (CET)
Received: by wombat.fafoe.narf.at (Postfix, from userid 1001)
	id EEBD144C; Fri,  5 Mar 2004 14:41:44 +0100 (CET)
Date: Fri, 5 Mar 2004 14:41:44 +0100
From: Stefan Farfeleder <stefan@fafoe.narf.at>
To: current@freebsd.org, i386@freebsd.org
Message-ID: <20040305134143.GC968@wombat.fafoe.narf.at>
Mail-Followup-To: current@freebsd.org, i386@freebsd.org
References: <20040305131628.81B747303A@freebsd-current.sentex.ca>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040305131628.81B747303A@freebsd-current.sentex.ca>
User-Agent: Mutt/1.5.6i
Subject: Re: [current tinderbox] failure on i386/pc98
X-BeenThere: freebsd-i386@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: I386-specific issues for FreeBSD <freebsd-i386.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-i386>,
	<mailto:freebsd-i386-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-i386>
List-Post: <mailto:freebsd-i386@freebsd.org>
List-Help: <mailto:freebsd-i386-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-i386>,
	<mailto:freebsd-i386-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Mar 2004 13:41:54 -0000

On Fri, Mar 05, 2004 at 08:16:28AM -0500, FreeBSD Tinderbox wrote:

> ===> usr.sbin/boot98cfg
> cc -O -pipe  -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -c /other/tinderbox/CURRENT/i386/pc98/src/usr.sbin/boot98cfg/boot98cfg.c
> /other/tinderbox/CURRENT/i386/pc98/src/usr.sbin/boot98cfg/boot98cfg.c: In function `main':
> /other/tinderbox/CURRENT/i386/pc98/src/usr.sbin/boot98cfg/boot98cfg.c:200: warning: comparison between pointer and integer
> /other/tinderbox/CURRENT/i386/pc98/src/usr.sbin/boot98cfg/boot98cfg.c:217: warning: comparison between pointer and integer

Suggested fix:

--- src/usr.sbin/boot98cfg/boot98cfg.c.orig	Fri Mar  5 14:25:11 2004
+++ src/usr.sbin/boot98cfg/boot98cfg.c	Fri Mar  5 14:27:14 2004
@@ -197,7 +197,7 @@
 			break;
 		case 's':
 			secsize = strtol(optarg, &endptr, 0);
-			if (errno || *optarg == NULL || *endptr)
+			if (errno || *optarg == '\0' || *endptr)
 				errx(1, "%s: Bad argument to -s option",
 				    optarg);
 			switch (secsize) {
@@ -214,7 +214,7 @@
 		case 'v':
 			v_flag = 1;
 			version = strtol(optarg, &endptr, 0);
-			if (errno || *optarg == NULL || *endptr ||
+			if (errno || *optarg == '\0' || *endptr ||
 			    version < 0 || version > 255)
 				errx(1, "%s: Bad argument to -s option",
 				    optarg);

Stefan