From nobody Mon Feb 9 00:56:39 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=1632146468; cv=none; d=zohomail.com; s=zohoarc; b=n0u3bLckY+dlFV8d92QiT3dp2TL9r7NIyz4MW51tVpUSXVwzkyW6LhRGrjPu7vBj+v/CtGHrKjisH48BAJkJa+0DEJAtR5gSNVgxm4E0NmcmMU0O7VhuaYr3sNevDfjvoiN6ePbBdjibGOyhHt6Ya94+7Y13XyVa7g0R+HT3Z1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632146468; 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=br4UnyF0iYHjhjK+PKN1e7pi+1nXLhx57GEmdCEoyf4=; b=hHZv3gvCDTvnVwlPpAPQysF7/vDAUevccfXUMtTSzoPK+H7Jdd5VRc9efoiqSGIelMWQtNQYShSfG14Cad1y24F5bi41ehRJf2twYJtd+NFwlkfsw7g/ii/Pzaza9rjZD64WtDlBmBMVpcTP1mnyR+4ODWpPRnaR7PlRWG+126E= 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) 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 1632146468466385.2787419260402; Mon, 20 Sep 2021 07:01:08 -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-551-h_B0h3nEOb2gugG7vzx-Qw-1; Mon, 20 Sep 2021 10:01:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 44F39A40C7; Mon, 20 Sep 2021 14:01:00 +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 1A6EB19724; Mon, 20 Sep 2021 14:01: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 DC7D71805989; Mon, 20 Sep 2021 14:00:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18KE0pBc010630 for ; Mon, 20 Sep 2021 10:00:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A6D36060F; Mon, 20 Sep 2021 14:00:51 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FBC960938 for ; Mon, 20 Sep 2021 14:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632146467; 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=br4UnyF0iYHjhjK+PKN1e7pi+1nXLhx57GEmdCEoyf4=; b=Wh8kYPWsaBbRTY1qwutH/HW5OZazp+AkWlpqhOuxzKJqR0KU4En4noym4dxqQ1c4YcBuIi D2ehcfDqULgQk2SxkkEeedBnxDS1Zl6J6yzcW+LrwCASrse/qJo/vnlsJtlzzQacy/H496 GQXFZADYIkWGmw1ciwlYcPVW1R0w21w= X-MC-Unique: h_B0h3nEOb2gugG7vzx-Qw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/4] util: virstring: Remove unused 'virStringListMerge' Date: Mon, 20 Sep 2021 16:00:45 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.84 on 10.5.11.23 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) X-ZM-MESSAGEID: 1632146488458100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/libvirt_private.syms | 1 - src/util/virstring.c | 35 ----------------------------------- src/util/virstring.h | 3 --- 3 files changed, 39 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ace35d709f..25ee21463c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3298,7 +3298,6 @@ virStringHasControlChars; virStringHasSuffix; virStringIsEmpty; virStringIsPrintable; -virStringListMerge; virStringMatch; virStringMatchesNameSuffix; virStringParsePort; diff --git a/src/util/virstring.c b/src/util/virstring.c index f416fed3c5..cee56debca 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -35,41 +35,6 @@ VIR_LOG_INIT("util.string"); -/** - * virStringListMerge: - * @dst: a NULL-terminated array of strings to expand - * @src: a NULL-terminated array of strings - * - * Merges @src into @dst. Upon successful return from this - * function, @dst is resized to $(dst + src) elements and @src is - * freed. - * - * Returns 0 on success, -1 otherwise. - */ -int -virStringListMerge(char ***dst, - char ***src) -{ - size_t dst_len, src_len, i; - - if (!src || !*src) - return 0; - - dst_len =3D g_strv_length(*dst); - src_len =3D g_strv_length(*src); - - VIR_REALLOC_N(*dst, dst_len + src_len + 1); - - for (i =3D 0; i <=3D src_len; i++) - (*dst)[i + dst_len] =3D (*src)[i]; - - /* Don't call g_strfreev() as it would free strings in - * @src. */ - VIR_FREE(*src); - return 0; -} - - /* Like strtol, but produce an "int" result, and check more carefully. Return 0 upon success; return -1 to indicate failure. When END_PTR is NULL, the byte after the final valid digit must be NUL. diff --git a/src/util/virstring.h b/src/util/virstring.h index ca81889c9b..45f07ddd7a 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -22,9 +22,6 @@ #define VIR_INT64_STR_BUFLEN 21 -int virStringListMerge(char ***dst, - char ***src); - int virStrToLong_i(char const *s, char **end_ptr, int base, --=20 2.31.1