From owner-svn-src-head@FreeBSD.ORG  Sun Mar 29 15:10:50 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2AAE510656EC;
	Sun, 29 Mar 2009 15:10:50 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 166A98FC19;
	Sun, 29 Mar 2009 15:10:50 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2TFAn2O037753;
	Sun, 29 Mar 2009 15:10:49 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2TFAnwD037751;
	Sun, 29 Mar 2009 15:10:49 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200903291510.n2TFAnwD037751@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 29 Mar 2009 15:10:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190522 - head/sys/dev/ofw
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2009 15:10:53 -0000

Author: marius
Date: Sun Mar 29 15:10:49 2009
New Revision: 190522
URL: http://svn.freebsd.org/changeset/base/190522

Log:
  Unbreak OF_interpret() and its standard implementation after r186347.

Modified:
  head/sys/dev/ofw/ofw_standard.c
  head/sys/dev/ofw/openfirm.c

Modified: head/sys/dev/ofw/ofw_standard.c
==============================================================================
--- head/sys/dev/ofw/ofw_standard.c	Sun Mar 29 13:35:20 2009	(r190521)
+++ head/sys/dev/ofw/ofw_standard.c	Sun Mar 29 15:10:49 2009	(r190522)
@@ -204,7 +204,7 @@ ofw_std_interpret(ofw_t ofw, const char 
 	}
 	status = args.slot[i++];
 	while (i < 1 + nreturns)
-		returns[j] = args.slot[i++];
+		returns[j++] = args.slot[i++];
 	return (status);
 }
 

Modified: head/sys/dev/ofw/openfirm.c
==============================================================================
--- head/sys/dev/ofw/openfirm.c	Sun Mar 29 13:35:20 2009	(r190521)
+++ head/sys/dev/ofw/openfirm.c	Sun Mar 29 15:10:49 2009	(r190522)
@@ -164,9 +164,11 @@ OF_interpret(const char *cmd, int nretur
 	int status;
 
 	status = OFW_INTERPRET(ofw_obj, cmd, nreturns, slots);
+	if (status == -1)
+		return (status);
 
 	va_start(ap, nreturns);
-	while (i < 1 + nreturns)
+	while (i < nreturns)
 		*va_arg(ap, cell_t *) = slots[i++];
 	va_end(ap);