From patchwork Mon Feb 29 23:19:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 8460181 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 847399F52D for ; Mon, 29 Feb 2016 23:20:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECA7E2022A for ; Mon, 29 Feb 2016 23:19:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45C6B20204 for ; Mon, 29 Feb 2016 23:19:59 +0000 (UTC) Received: from localhost ([::1]:39615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaX6c-0001Tw-HN for patchwork-qemu-devel@patchwork.kernel.org; Mon, 29 Feb 2016 18:19:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaX6O-0001RT-Rp for qemu-devel@nongnu.org; Mon, 29 Feb 2016 18:19:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaX6N-00069G-UN for qemu-devel@nongnu.org; Mon, 29 Feb 2016 18:19:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaX6K-00068C-GM; Mon, 29 Feb 2016 18:19:40 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 236247304F; Mon, 29 Feb 2016 23:19:40 +0000 (UTC) Received: from localhost (ovpn-116-81.ams2.redhat.com [10.36.116.81]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1TNJcCn018644 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 29 Feb 2016 18:19:39 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 1 Mar 2016 00:19:18 +0100 Message-Id: <1456787973-19348-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1456787973-19348-1-git-send-email-mreitz@redhat.com> References: <1456787973-19348-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 29 Feb 2016 23:19:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , Paolo Bonzini , Luiz Capitulino Subject: [Qemu-devel] [PATCH v2 01/16] qdict: Add qdict_change_key() 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a shorthand function for changing a QDict's entry's key. Signed-off-by: Max Reitz --- include/qapi/qmp/qdict.h | 1 + qobject/qdict.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index 71b8eb0..223f746 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -39,6 +39,7 @@ size_t qdict_size(const QDict *qdict); void qdict_put_obj(QDict *qdict, const char *key, QObject *value); void qdict_del(QDict *qdict, const char *key); int qdict_haskey(const QDict *qdict, const char *key); +bool qdict_change_key(QDict *qdict, const char *old_key, const char *new_key); QObject *qdict_get(const QDict *qdict, const char *key); QDict *qobject_to_qdict(const QObject *obj); void qdict_iter(const QDict *qdict, diff --git a/qobject/qdict.c b/qobject/qdict.c index 9833bd0..bbfe39f 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -168,6 +168,29 @@ int qdict_haskey(const QDict *qdict, const char *key) } /** + * qdict_change_key(): Changes an entry's key + * + * Removes the entry with the key 'old_key' and inserts its associated value as + * a new entry with the key 'new_key'. + * + * Returns false if 'old_key' does not exist, true otherwise. + */ +bool qdict_change_key(QDict *qdict, const char *old_key, const char *new_key) +{ + QObject *value = qdict_get(qdict, old_key); + + if (!value) { + return false; + } + + qobject_incref(value); + qdict_del(qdict, old_key); + qdict_put_obj(qdict, new_key, value); + + return true; +} + +/** * qdict_size(): Return the size of the dictionary */ size_t qdict_size(const QDict *qdict)