External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote_internal.c: appease clang

Browse Source 
* 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.
This commit is contained in:
Jim Meyering 2009-09-02 12:22:14 +02:00
parent 45aec0eae4
commit 1f5e292520
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/remote_internal.c
View File

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