External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

maint: improve VIR_ERR_INVALID_SECRET usage

Browse Source 
While all errors related to invalid secrets appeared to be
consistent, we might as well continue the trend of using a
common macro.  Just as in commit 6e130ddc, the difference
between VIR_IS_SECRET and VIR_IS_CONNECTED_SECRET is moot
(due to reference counting, any valid secret must be tied to
a valid domain).  For now, we don't need virCheckSecretGoto().

* src/datatypes.h (virCheckSecretReturn): New macro.
(VIR_IS_SECRET, VIR_IS_CONNECTED_SECRET): Drop unused macros.
* src/libvirt.c: Use macro throughout.
(virLibSecretError): Drop unused macro.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2013-12-27 18:12:05 -07:00
parent 9ec935d565
commit 916273eb94
2 changed files with 33 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/datatypes.h
View File

@ -178,10 +178,19 @@ extern virClassPtr virStoragePoolClass;
} \ } \
} while (0) } while (0)
# define VIR_IS_SECRET(obj) \ # define virCheckSecretReturn(obj, retval) \
(virObjectIsClass((obj), virSecretClass)) do { \
# define VIR_IS_CONNECTED_SECRET(obj) \ virSecretPtr _secret = (obj); \
(VIR_IS_SECRET(obj) && virObjectIsClass((obj)->conn, virConnectClass)) if (!virObjectIsClass(_secret, virSecretClass) || \
!virObjectIsClass(_secret->conn, virConnectClass)) { \
virReportErrorHelper(VIR_FROM_SECRET, \
VIR_ERR_INVALID_SECRET, \
__FILE__, __FUNCTION__, __LINE__, \
__FUNCTION__); \
virDispatchError(NULL); \
return retval; \
} \
} while (0)
# define VIR_IS_STREAM(obj) \ # define VIR_IS_STREAM(obj) \
(virObjectIsClass((obj), virStreamClass)) (virObjectIsClass((obj), virStreamClass))

79
src/libvirt.c
View File

@ -528,9 +528,6 @@ DllMain(HINSTANCE instance ATTRIBUTE_UNUSED,
#define virLibDomainError(code, ...) \ #define virLibDomainError(code, ...) \
virReportErrorHelper(VIR_FROM_DOM, code, __FILE__, \ virReportErrorHelper(VIR_FROM_DOM, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__) __FUNCTION__, __LINE__, __VA_ARGS__)
#define virLibSecretError(code, ...) \
virReportErrorHelper(VIR_FROM_SECRET, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__)
#define virLibStreamError(code, ...) \ #define virLibStreamError(code, ...) \
virReportErrorHelper(VIR_FROM_STREAMS, code, __FILE__, \ virReportErrorHelper(VIR_FROM_STREAMS, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__) __FUNCTION__, __LINE__, __VA_ARGS__)
@ -14967,11 +14964,8 @@ virSecretGetConnect(virSecretPtr secret)
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_SECRET(secret)) { virCheckSecretReturn(secret, NULL);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return NULL;
}
return secret->conn; return secret->conn;
} }
@ -15290,11 +15284,7 @@ virSecretGetUUID(virSecretPtr secret, unsigned char *uuid)
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_SECRET(secret)) { virCheckSecretReturn(secret, -1);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return -1;
}
virCheckNonNullArgGoto(uuid, error); virCheckNonNullArgGoto(uuid, error);
memcpy(uuid, &secret->uuid[0], VIR_UUID_BUFLEN); memcpy(uuid, &secret->uuid[0], VIR_UUID_BUFLEN);
@ -15324,11 +15314,7 @@ virSecretGetUUIDString(virSecretPtr secret, char *buf)
virResetLastError(); virResetLastError();
if (!VIR_IS_SECRET(secret)) { virCheckSecretReturn(secret, -1);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return -1;
}
virCheckNonNullArgGoto(buf, error); virCheckNonNullArgGoto(buf, error);
virUUIDFormat(secret->uuid, buf); virUUIDFormat(secret->uuid, buf);
@ -15360,11 +15346,8 @@ virSecretGetUsageType(virSecretPtr secret)
virResetLastError(); virResetLastError();
if (!VIR_IS_SECRET(secret)) { virCheckSecretReturn(secret, -1);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return -1;
}
return secret->usageType; return secret->usageType;
} }
@ -15392,11 +15375,8 @@ virSecretGetUsageID(virSecretPtr secret)
virResetLastError(); virResetLastError();
if (!VIR_IS_SECRET(secret)) { virCheckSecretReturn(secret, NULL);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return NULL;
}
return secret->usageID; return secret->usageID;
} }
@ -15420,13 +15400,9 @@ virSecretGetXMLDesc(virSecretPtr secret, unsigned int flags)
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_SECRET(secret)) { virCheckSecretReturn(secret, NULL);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return NULL;
}
conn = secret->conn; conn = secret->conn;
if (conn->secretDriver != NULL && conn->secretDriver->secretGetXMLDesc != NULL) { if (conn->secretDriver != NULL && conn->secretDriver->secretGetXMLDesc != NULL) {
char *ret; char *ret;
@ -15466,12 +15442,9 @@ virSecretSetValue(virSecretPtr secret, const unsigned char *value,
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_SECRET(secret)) { virCheckSecretReturn(secret, -1);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return -1;
}
conn = secret->conn; conn = secret->conn;
virCheckReadOnlyGoto(conn->flags, error); virCheckReadOnlyGoto(conn->flags, error);
virCheckNonNullArgGoto(value, error); virCheckNonNullArgGoto(value, error);
@ -15512,12 +15485,9 @@ virSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags)
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_SECRET(secret)) { virCheckSecretReturn(secret, NULL);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return NULL;
}
conn = secret->conn; conn = secret->conn;
virCheckReadOnlyGoto(conn->flags, error); virCheckReadOnlyGoto(conn->flags, error);
virCheckNonNullArgGoto(value_size, error); virCheckNonNullArgGoto(value_size, error);
@ -15556,12 +15526,9 @@ virSecretUndefine(virSecretPtr secret)
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_SECRET(secret)) { virCheckSecretReturn(secret, -1);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return -1;
}
conn = secret->conn; conn = secret->conn;
virCheckReadOnlyGoto(conn->flags, error); virCheckReadOnlyGoto(conn->flags, error);
if (conn->secretDriver != NULL && conn->secretDriver->secretUndefine != NULL) { if (conn->secretDriver != NULL && conn->secretDriver->secretUndefine != NULL) {
@ -15605,11 +15572,8 @@ virSecretRef(virSecretPtr secret)
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_SECRET(secret)) { virCheckSecretReturn(secret, -1);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return -1;
}
virObjectRef(secret); virObjectRef(secret);
return 0; return 0;
} }
@ -15630,11 +15594,8 @@ virSecretFree(virSecretPtr secret)
virResetLastError(); virResetLastError();
if (!VIR_IS_CONNECTED_SECRET(secret)) { virCheckSecretReturn(secret, -1);
virLibSecretError(VIR_ERR_INVALID_SECRET, __FUNCTION__);
virDispatchError(NULL);
return -1;
}
virObjectUnref(secret); virObjectUnref(secret);
return 0; return 0;
} }