From 1f5e29252002c4110f568ea15e21f931b388bdef Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Wed, 2 Sep 2009 12:22:14 +0200
Subject: [PATCH] remote_internal.c: appease clang

* src/remote_internal.c (remoteNetworkOpen): Mark "conn" parameter
as non-NULL.  Remove now-unnecessary "conn == NULL" test.
(remoteDevMonOpen): Likewise.
(remoteSecretOpen): Likewise.
(remoteStorageOpen): Likewise.
(remoteInterfaceOpen): Likewise.
---
 src/remote_internal.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/remote_internal.c b/src/remote_internal.c
index ea50c113a4..c1db27c2d8 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -3278,7 +3278,7 @@ done:
 
 /*----------------------------------------------------------------------*/
 
-static virDrvOpenStatus
+static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
 remoteNetworkOpen (virConnectPtr conn,
                    virConnectAuthPtr auth,
                    int flags)
@@ -3286,8 +3286,7 @@ remoteNetworkOpen (virConnectPtr conn,
     if (inside_daemon)
         return VIR_DRV_OPEN_DECLINED;
 
-    if (conn &&
-        conn->driver &&
+    if (conn->driver &&
         STREQ (conn->driver->name, "remote")) {
         struct private_data *priv;
 
@@ -3768,16 +3767,15 @@ done:
 
 /*----------------------------------------------------------------------*/
 
-static virDrvOpenStatus
+static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
 remoteInterfaceOpen (virConnectPtr conn,
-                   virConnectAuthPtr auth,
-                   int flags)
+                     virConnectAuthPtr auth,
+                     int flags)
 {
     if (inside_daemon)
         return VIR_DRV_OPEN_DECLINED;
 
-    if (conn &&
-        conn->driver &&
+    if (conn->driver &&
         STREQ (conn->driver->name, "remote")) {
         struct private_data *priv;
 
@@ -4159,7 +4157,7 @@ done:
 
 /*----------------------------------------------------------------------*/
 
-static virDrvOpenStatus
+static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
 remoteStorageOpen (virConnectPtr conn,
                    virConnectAuthPtr auth,
                    int flags)
@@ -4167,8 +4165,7 @@ remoteStorageOpen (virConnectPtr conn,
     if (inside_daemon)
         return VIR_DRV_OPEN_DECLINED;
 
-    if (conn &&
-        conn->driver &&
+    if (conn->driver &&
         STREQ (conn->driver->name, "remote")) {
         struct private_data *priv = conn->privateData;
         /* If we're here, the remote driver is already
@@ -5127,7 +5124,7 @@ done:
 
 /*----------------------------------------------------------------------*/
 
-static virDrvOpenStatus
+static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
 remoteDevMonOpen(virConnectPtr conn,
                  virConnectAuthPtr auth ATTRIBUTE_UNUSED,
                  int flags ATTRIBUTE_UNUSED)
@@ -5135,8 +5132,7 @@ remoteDevMonOpen(virConnectPtr conn,
     if (inside_daemon)
         return VIR_DRV_OPEN_DECLINED;
 
-    if (conn &&
-        conn->driver &&
+    if (conn->driver &&
         STREQ (conn->driver->name, "remote")) {
         struct private_data *priv = conn->privateData;
         /* If we're here, the remote driver is already
@@ -6342,7 +6338,7 @@ done:
     return rv;
 }
 
-static virDrvOpenStatus
+static virDrvOpenStatus ATTRIBUTE_NONNULL (1)
 remoteSecretOpen (virConnectPtr conn,
                   virConnectAuthPtr auth,
                   int flags)
@@ -6350,8 +6346,7 @@ remoteSecretOpen (virConnectPtr conn,
     if (inside_daemon)
         return VIR_DRV_OPEN_DECLINED;
 
-    if (conn &&
-        conn->driver &&
+    if (conn->driver &&
         STREQ (conn->driver->name, "remote")) {
         struct private_data *priv;
 
-- 
GitLab