From patchwork Wed Jan 16 17:22:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 212851 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 70C0E2C008F for ; Thu, 17 Jan 2013 04:22:46 +1100 (EST) Received: from localhost ([::1]:47303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWhI-0006RJ-JF for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 12:22:44 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWh9-0006Q5-BZ for qemu-devel@nongnu.org; Wed, 16 Jan 2013 12:22:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvWh6-0006R1-R4 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 12:22:35 -0500 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:59824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWh6-0006Qu-KI; Wed, 16 Jan 2013 12:22:32 -0500 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 148677280056; Wed, 16 Jan 2013 18:22:32 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EBeceQsKG7Ef; Wed, 16 Jan 2013 18:22:30 +0100 (CET) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id A0B957280057; Wed, 16 Jan 2013 18:22:30 +0100 (CET) From: Stefan Weil To: qemu-ppc@nongnu.org Date: Wed, 16 Jan 2013 18:22:29 +0100 Message-Id: <1358356949-30537-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 78.47.199.172 Cc: Stefan Weil , qemu-devel@nongnu.org, Alexander Graf Subject: [Qemu-devel] [PATCH] pseries: Replace non-portable asprintf by g_strdup_printf 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 g_strdup_printf already handles OOM errors, so some error handling in QEMU code can be removed. Signed-off-by: Stefan Weil --- hw/spapr.c | 7 ++----- hw/spapr_vio.c | 29 ++++++----------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 21c261b..d80b792 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -328,14 +328,11 @@ static void *spapr_create_fdt_skel(const char *cpu_model, continue; } - if (asprintf(&nodename, "%s@%x", modelname, index) < 0) { - fprintf(stderr, "Allocation failure\n"); - exit(1); - } + nodename = g_strdup_printf("%s@%x", modelname, index); _FDT((fdt_begin_node(fdt, nodename))); - free(nodename); + g_free(nodename); _FDT((fdt_property_cell(fdt, "reg", index))); _FDT((fdt_property_string(fdt, "device_type", "cpu"))); diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c index 3a1a486..2054219 100644 --- a/hw/spapr_vio.c +++ b/hw/spapr_vio.c @@ -80,9 +80,7 @@ static char *vio_format_dev_name(VIOsPAPRDevice *dev) char *name; /* Device tree style name device@reg */ - if (asprintf(&name, "%s@%x", pc->dt_name, dev->reg) < 0) { - return NULL; - } + name = g_strdup_printf("%s@%x", pc->dt_name, dev->reg); return name; } @@ -101,12 +99,8 @@ static int vio_make_devnode(VIOsPAPRDevice *dev, } dt_name = vio_format_dev_name(dev); - if (!dt_name) { - return -ENOMEM; - } - node_off = fdt_add_subnode(fdt, vdevice_off, dt_name); - free(dt_name); + g_free(dt_name); if (node_off < 0) { return node_off; } @@ -444,9 +438,6 @@ static int spapr_vio_busdev_init(DeviceState *qdev) /* Don't overwrite ids assigned on the command line */ if (!dev->qdev.id) { id = vio_format_dev_name(dev); - if (!id) { - return -1; - } dev->qdev.id = id; } @@ -646,20 +637,12 @@ int spapr_populate_chosen_stdout(void *fdt, VIOsPAPRBus *bus) } name = vio_format_dev_name(dev); - if (!name) { - return -ENOMEM; - } - - if (asprintf(&path, "/vdevice/%s", name) < 0) { - path = NULL; - ret = -ENOMEM; - goto out; - } + path = g_strdup_printf("/vdevice/%s", name); ret = fdt_setprop_string(fdt, offset, "linux,stdout-path", path); -out: - free(name); - free(path); + + g_free(name); + g_free(path); return ret; }