From nobody Mon Dec 15 23:27:08 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1517499384413380.95853990898297; Thu, 1 Feb 2018 07:36:24 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id D0839780F4; Thu, 1 Feb 2018 15:36:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FA6E61348; Thu, 1 Feb 2018 15:36:22 +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 47F743FC71; Thu, 1 Feb 2018 15:36:22 +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 w11Fa5ww015126 for ; Thu, 1 Feb 2018 10:36:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0B33660C1D; Thu, 1 Feb 2018 15:36:05 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39AC860A9A; Thu, 1 Feb 2018 15:36:02 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 1 Feb 2018 15:35:51 +0000 Message-Id: <20180201153552.20047-3-berrange@redhat.com> In-Reply-To: <20180201153552.20047-1-berrange@redhat.com> References: <20180201153552.20047-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] rpc: assume private data callbacks are always non-NULL 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: , Content-Type: text/plain; charset="utf-8" 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 01 Feb 2018 15:36:23 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Since we annotate the APIs are having non-NULL parameters, we can remove the checks for NULL in the code too. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Ferlan --- src/rpc/virnetserverclient.c | 47 ++++++++++++++++++++--------------------= ---- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index d81a3892ff..388514946b 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -466,14 +466,12 @@ virNetServerClientPtr virNetServerClientNew(unsigned = long long id, now))) return NULL; =20 - if (privNew) { - if (!(client->privateData =3D privNew(client, privOpaque))) { - virObjectUnref(client); - return NULL; - } - client->privateDataFreeFunc =3D privFree; - client->privateDataPreExecRestart =3D privPreExecRestart; + if (!(client->privateData =3D privNew(client, privOpaque))) { + virObjectUnref(client); + return NULL; } + client->privateDataFreeFunc =3D privFree; + client->privateDataPreExecRestart =3D privPreExecRestart; =20 return client; } @@ -580,18 +578,18 @@ virNetServerClientPtr virNetServerClientNewPostExecRe= start(virNetServerPtr srv, } virObjectUnref(sock); =20 - if (privNew) { - if (!(child =3D virJSONValueObjectGet(object, "privateData"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing privateData field in JSON state docu= ment")); - goto error; - } - if (!(client->privateData =3D privNew(client, child, privOpaque))) - goto error; - client->privateDataFreeFunc =3D privFree; - client->privateDataPreExecRestart =3D privPreExecRestart; + if (!(child =3D virJSONValueObjectGet(object, "privateData"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing privateData field in JSON state document= ")); + goto error; } =20 + if (!(client->privateData =3D privNew(client, child, privOpaque))) + goto error; + + client->privateDataFreeFunc =3D privFree; + client->privateDataPreExecRestart =3D privPreExecRestart; + =20 return client; =20 @@ -637,14 +635,12 @@ virJSONValuePtr virNetServerClientPreExecRestart(virN= etServerClientPtr client) goto error; } =20 - if (client->privateData && client->privateDataPreExecRestart) { - if (!(child =3D client->privateDataPreExecRestart(client, client->= privateData))) - goto error; + if (!(child =3D client->privateDataPreExecRestart(client, client->priv= ateData))) + goto error; =20 - if (virJSONValueObjectAppend(object, "privateData", child) < 0) { - virJSONValueFree(child); - goto error; - } + if (virJSONValueObjectAppend(object, "privateData", child) < 0) { + virJSONValueFree(child); + goto error; } =20 virObjectUnlock(client); @@ -989,8 +985,7 @@ void virNetServerClientDispose(void *obj) PROBE(RPC_SERVER_CLIENT_DISPOSE, "client=3D%p", client); =20 - if (client->privateData && - client->privateDataFreeFunc) + if (client->privateData) client->privateDataFreeFunc(client->privateData); =20 virObjectUnref(client->identity); --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list