From patchwork Wed May 29 13:50:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 247394 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E9AE2C02A7 for ; Thu, 30 May 2013 06:12:09 +1000 (EST) Received: from localhost ([::1]:51036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uhmj8-0008OE-Rd for incoming@patchwork.ozlabs.org; Wed, 29 May 2013 16:12:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhgmW-0001Vo-JC for qemu-devel@nongnu.org; Wed, 29 May 2013 09:51:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhgmV-0006zf-2K for qemu-devel@nongnu.org; Wed, 29 May 2013 09:51:12 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.24]:42516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhgmU-0006za-Si for qemu-devel@nongnu.org; Wed, 29 May 2013 09:51:11 -0400 Received: from [217.84.5.141] (helo=stokes.schwinge.homeip.net) by smtprelay01.ispgateway.de with esmtpa (Exim 4.68) (envelope-from ) id 1UhgmU-0003fF-4a for qemu-devel@nongnu.org; Wed, 29 May 2013 15:51:10 +0200 Received: (qmail 5390 invoked from network); 29 May 2013 13:51:00 -0000 Received: from feldtkeller.schwinge.homeip.net (192.168.111.172) by stokes.schwinge.homeip.net with QMQP; 29 May 2013 13:51:00 -0000 Received: (nullmailer pid 28192 invoked by uid 1000); Wed, 29 May 2013 13:50:50 -0000 From: Thomas Schwinge To: qemu-devel@nongnu.org Date: Wed, 29 May 2013 15:50:31 +0200 Message-Id: <1369835434-27727-2-git-send-email-thomas@codesourcery.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1369835434-27727-1-git-send-email-thomas@codesourcery.com> References: <1369835434-27727-1-git-send-email-thomas@codesourcery.com> X-Df-Sender: dGhvbWFzQHNjaHdpbmdlLm5hbWU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.67.31.24 X-Mailman-Approved-At: Wed, 29 May 2013 16:11:28 -0400 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, sw@weilnetz.de, riku.voipio@iki.fi, agraf@suse.de, paul@codesourcery.com, j.schauer@email.de, Thomas Schwinge Subject: [Qemu-devel] [PATCH 1/4] util/envlist: Properly forward a callback's error in envlist_parse. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Thomas Schwinge Reviewed-by: Peter Maydell --- util/envlist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git util/envlist.c util/envlist.c index ebc06cf..cbbf7e5 100644 --- util/envlist.c +++ util/envlist.c @@ -109,9 +109,10 @@ envlist_parse(envlist_t *envlist, const char *env, envvar = strtok_r(tmpenv, ",", &envsave); while (envvar != NULL) { - if ((*callback)(envlist, envvar) != 0) { + int err; + if ((err = (*callback)(envlist, envvar)) != 0) { free(tmpenv); - return (errno); + return (err); } envvar = strtok_r(NULL, ",", &envsave); }