From nobody Thu Mar 28 17:40:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1637344564; cv=none; d=zohomail.com; s=zohoarc; b=AFLQTInhibwU2VhTqZcl3MJABtEH0UbBukZW++Coh71eOvdU4dDB0ATERxOJGmYKVfo0s4pXhoG7i7SrpV0khQja2qyKyOAS0xF/ytY9EZz8Mv2qsziYyGMimNkbsQz1RyCTC+EPv5ZF5W8mR6A1YI6xhaLEBUoOxXI7Fk55Sn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637344564; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=kKHqEz771VwtNVk3pJbUsVP6i7L/SP2KktqJY/PWTq0=; b=a9sBIsdV52cWvHwEhm4Ij0znkRxrTqX3TNWRJJIG8JQIzyjS8JB1jbaDJ9TVLZYWxrGYItGtmjqqsaWxYzw1OxcIABSKqjJEXl0bQZaqJnWDnVj0owj/wH7rW2KWqrHrzQAE7382SBWoj/Oh+IbD8lqtVI53B+QBhsFIy5KjDwE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637344564797244.1432710417829; Fri, 19 Nov 2021 09:56:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-482-28UxC9OwOpOx1Ssiu1RdeA-1; Fri, 19 Nov 2021 12:55:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D578587D542; Fri, 19 Nov 2021 17:55:54 +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 0056419811; Fri, 19 Nov 2021 17:55:53 +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 579EA1832E81; Fri, 19 Nov 2021 17:55:52 +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 1AJHr1Tw000405 for ; Fri, 19 Nov 2021 12:53:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id 973D34ABD0; Fri, 19 Nov 2021 17:53:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12564694B6 for ; Fri, 19 Nov 2021 17:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637344563; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=kKHqEz771VwtNVk3pJbUsVP6i7L/SP2KktqJY/PWTq0=; b=YLJ7tRQAYHwMw02VTdMEIzrhgQmYhicvWHXrOC3Ij8KfqQCN+AE24G53Gn2jHKbncWhLW2 zUDPdkBJ31EWX8V/S5HVQJftkBLE0PTll0hNJH+eZBI7G+6cYaEqJejyFlEcNVjOQ4tXmW fOyP6Q8R4W/9NR3zsLR99wQSHKTyjj0= X-MC-Unique: 28UxC9OwOpOx1Ssiu1RdeA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH] util: fix various ATTRIBUTE_NONNULL calls Date: Fri, 19 Nov 2021 18:52:48 +0100 Message-Id: <9b09a528b0d68c3a0503b826c797bc219326ac64.1637344353.git.phrdina@redhat.com> 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.79 on 10.5.11.11 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: 1637344566474100001 Content-Type: text/plain; charset="utf-8" Git bisect took me to commit where incorrect usage of ATTRIBUTE_NONNULL was introduced and caused coverity scan to fail. This patch fixes the issue where the index starts from 1 and not 0 and two other different cases. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/util/viralloc.h | 2 +- src/util/virnetdevopenvswitch.h | 2 +- src/util/virxml.h | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 3a09af65c5..fe4ecb6620 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -53,7 +53,7 @@ void virAppendElement(void *ptrptr, void *newelem, bool clearOriginal, bool inPlace) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); int virDeleteElementsN(void *ptrptr, size_t size, size_t at, size_t *count= ptr, size_t toremove, bool inPlace) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitc= h.h index 4478f2bb37..e275af59df 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -82,7 +82,7 @@ int virNetDevOpenvswitchInterfaceClearQos(const char *ifn= ame, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchInterfaceClearRxQos(const char *ifname) -ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname, const unsigned char *v= mid) diff --git a/src/util/virxml.h b/src/util/virxml.h index 06fb7aebd8..5e42fc3591 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -109,14 +109,14 @@ virXMLPropTristateBool(xmlNodePtr node, const char *name, virXMLPropFlags flags, virTristateBool *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); =20 int virXMLPropTristateSwitch(xmlNodePtr node, const char *name, virXMLPropFlags flags, virTristateSwitch *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); =20 int virXMLPropInt(xmlNodePtr node, @@ -125,7 +125,7 @@ virXMLPropInt(xmlNodePtr node, virXMLPropFlags flags, int *result, int defaultResult) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); =20 int virXMLPropUInt(xmlNodePtr node, @@ -133,7 +133,7 @@ virXMLPropUInt(xmlNodePtr node, int base, virXMLPropFlags flags, unsigned int *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); =20 int virXMLPropULongLong(xmlNodePtr node, @@ -141,7 +141,7 @@ virXMLPropULongLong(xmlNodePtr node, int base, virXMLPropFlags flags, unsigned long long *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); =20 int virXMLPropEnum(xmlNodePtr node, @@ -149,8 +149,8 @@ virXMLPropEnum(xmlNodePtr node, int (*strToInt)(const char*), virXMLPropFlags flags, unsigned int *result) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(5); =20 int virXMLPropEnumDefault(xmlNodePtr node, @@ -159,8 +159,8 @@ virXMLPropEnumDefault(xmlNodePtr node, virXMLPropFlags flags, unsigned int *result, unsigned int defaultResult) - ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(5); =20 =20 /* Internal function; prefer the macros below. */ --=20 2.31.1