From nobody Thu May 15 07:03:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1510563062666264.7037825205498; Mon, 13 Nov 2017 00:51:02 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 23705FC7CA; Mon, 13 Nov 2017 08:51:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2758578405; Mon, 13 Nov 2017 08:51:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E9E751801213; Mon, 13 Nov 2017 08:50:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAD8oiMd016238 for ; Mon, 13 Nov 2017 03:50:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7FB3C703A2; Mon, 13 Nov 2017 08:50:44 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5195470399 for ; Mon, 13 Nov 2017 08:50:42 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.brq.redhat.com [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id 49E5A123A78 for ; Mon, 13 Nov 2017 09:50:41 +0100 (CET) From: Martin Kletzander To: libvir-list@redhat.com Date: Mon, 13 Nov 2017 09:50:19 +0100 Message-Id: <6d2a0002a4716f5c9489b416f08e61bc094e94de.1510560300.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/21] util: Rename virBitmapString to virBitmapToString X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 13 Nov 2017 08:51:01 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This follows the virBitmapToData() function and, similarly to virBitmapNewData(), we'll be able to have virBitmapNewString() later on without name confusion. Signed-off-by: Martin Kletzander --- src/libvirt_private.syms | 2 +- src/qemu/qemu_capabilities.c | 4 ++-- src/util/virbitmap.c | 4 ++-- src/util/virbitmap.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d4bae6150bb8..c11dc9ab5672 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1369,9 +1369,9 @@ virBitmapSetAll; virBitmapSetBit; virBitmapSetBitExpand; virBitmapSize; -virBitmapString; virBitmapToData; virBitmapToDataBuf; +virBitmapToString; =20 =20 # util/virbuffer.h diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c87feefb3be3..60ca8ee9ef84 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1509,7 +1509,7 @@ int virQEMUCapsParseHelpStr(const char *qemu, qemuCaps, check_yajl) < 0) goto cleanup; =20 - strflags =3D virBitmapString(qemuCaps->flags, true); + strflags =3D virBitmapToString(qemuCaps->flags, true); VIR_DEBUG("Version %u.%u.%u, cooked version %u, flags %s", major, minor, micro, *version, NULLSTR(strflags)); VIR_FREE(strflags); @@ -2376,7 +2376,7 @@ virQEMUCapsClear(virQEMUCapsPtr qemuCaps, =20 char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps) { - return virBitmapString(qemuCaps->flags, true); + return virBitmapToString(qemuCaps->flags, true); } =20 =20 diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index cb6600074781..58ef1a2e299b 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -310,7 +310,7 @@ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool= *result) } =20 /** - * virBitmapString: + * virBitmapToString: * @bitmap: Pointer to bitmap * @prefix: Whether to prepend "0x" * @@ -318,7 +318,7 @@ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool= *result) * * Returns pointer to the string or NULL on error. */ -char *virBitmapString(virBitmapPtr bitmap, bool prefix) +char *virBitmapToString(virBitmapPtr bitmap, bool prefix) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; size_t sz; diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index dc8fb71a07b8..99eb779d7188 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -80,7 +80,7 @@ bool virBitmapIsBitSet(virBitmapPtr bitmap, size_t b) int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; =20 -char *virBitmapString(virBitmapPtr bitmap, bool prefix) +char *virBitmapToString(virBitmapPtr bitmap, bool prefix) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; =20 char *virBitmapFormat(virBitmapPtr bitmap); --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list