From nobody Sun Feb 8 19:13:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616197063; cv=none; d=zohomail.com; s=zohoarc; b=YfdvDoqWP8VEngjdzYAL9IJ1RnVY8OBsvGwtR0/CjJ5mQeM7Ro9K0Vpd06uxw6An0BbofIruOHR+Cnetn4tDjQx895EuErIlWJaKJRn2IDeYws6OZETv/wnVrnLYH+GtVo7xbCbnvze2Oo9C62xcCGMQBQ+VleIXRl6qeuThKAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616197063; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u+CZd/vBadVFjzwc367zQwujkMAOD85Us2Va6JDOYz0=; b=S0s0WgH1S2rJKSCSE9tpmESOXC1sHPmU9swqXze2XzzCUihcE//W5VGdi6JsqC84M1pndi/PpUH8S/X4v8ybZrXNOTbgKDNxpPIy6mT9d7OpgGC2WYAhaU4KnTd0nl98JUFK5XYTweBnIcTq9ukRuEyNzsS8KLlGJHGFWswgAG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616197063644924.5211536613643; Fri, 19 Mar 2021 16:37:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-213-Dwdz7jsgPvqaL2rk39ApRA-1; Fri, 19 Mar 2021 19:37:39 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A0D04108BD06; Fri, 19 Mar 2021 23:37:33 +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 7B64D2915F; Fri, 19 Mar 2021 23:37:33 +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 42647180B450; Fri, 19 Mar 2021 23:37:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JNbCn0029427 for ; Fri, 19 Mar 2021 19:37:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E7CB5C1D1; Fri, 19 Mar 2021 23:37:12 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.40.194.173]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 618E55C1BB for ; Fri, 19 Mar 2021 23:37:08 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 6F145244032; Sat, 20 Mar 2021 00:37:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616197062; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=u+CZd/vBadVFjzwc367zQwujkMAOD85Us2Va6JDOYz0=; b=OMXGRHRQ/cNATCMYgvCLhTeEKRa1TIqQ/7o93CaxFGjW1n/qDD3L5ExIZM07AGFmZ/I7To dU9xniMOi5NPNs2aSwFnqzCMF6AXzcTtSJGEKyV1Cz3nVQV9pDC1xjnCD3RP2n07dJQ8ib hR74h+xIebGuDZfnkW6hBoO8Umf6dR8= X-MC-Unique: Dwdz7jsgPvqaL2rk39ApRA-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 3/7] util: Make virResizeN return void Date: Sat, 20 Mar 2021 00:37:02 +0100 Message-Id: <91f528d027c549f4430de5fdc34b373f9ae05146.1616196713.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/util/viralloc.c | 17 +++++++++-------- src/util/viralloc.h | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/util/viralloc.c b/src/util/viralloc.c index 1317537c8a..cd770eb601 100644 --- a/src/util/viralloc.c +++ b/src/util/viralloc.c @@ -98,13 +98,13 @@ int virExpandN(void *ptrptr, * failure, 'ptrptr' and 'allocptr' are not changed. Any newly * allocated memory in 'ptrptr' is zero-filled. * - * Returns zero on success, aborts on OOM + * Aborts on OOM */ -int virResizeN(void *ptrptr, - size_t size, - size_t *allocptr, - size_t count, - size_t add) +void virResizeN(void *ptrptr, + size_t size, + size_t *allocptr, + size_t count, + size_t add) { size_t delta; =20 @@ -112,12 +112,13 @@ int virResizeN(void *ptrptr, abort(); =20 if (count + add <=3D *allocptr) - return 0; + return; =20 delta =3D count + add - *allocptr; if (delta < *allocptr / 2) delta =3D *allocptr / 2; - return virExpandN(ptrptr, size, allocptr, delta); + + virExpandN(ptrptr, size, allocptr, delta); } =20 /** diff --git a/src/util/viralloc.h b/src/util/viralloc.h index d656d4ba0e..878c9485cf 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -38,7 +38,7 @@ int virReallocN(void *ptrptr, size_t size, size_t count) ATTRIBUTE_NONNULL(1); int virExpandN(void *ptrptr, size_t size, size_t *count, size_t add) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); -int virResizeN(void *ptrptr, size_t size, size_t *alloc, size_t count, siz= e_t desired) +void virResizeN(void *ptrptr, size_t size, size_t *alloc, size_t count, si= ze_t desired) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); void virShrinkN(void *ptrptr, size_t size, size_t *count, size_t toremove) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); @@ -102,7 +102,7 @@ int virDeleteElementsN(void *ptrptr, size_t size, size_= t at, size_t *countptr, * * This macro is safe to use on arguments with side effects. * - * Returns 0 on success, aborts on OOM + * Aborts on OOM */ #define VIR_RESIZE_N(ptr, alloc, count, add) \ virResizeN(&(ptr), sizeof(*(ptr)), &(alloc), count, add) --=20 2.31.0