openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: removed unused virIdentityIsEqual method 

It is simpler to remove this unused method than to rewrite it using
typed parameters in the next patch.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-08-06 16:52:03 +01:00
parent 1bbc53c264
commit f3fa662353
4 changed files with 0 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -2153,7 +2153,6 @@ virIdentityGetUNIXGroupID;
virIdentityGetUNIXUserID; virIdentityGetUNIXUserID;
virIdentityGetUserName; virIdentityGetUserName;
virIdentityGetX509DName; virIdentityGetX509DName;
virIdentityIsEqual;
virIdentityNew; virIdentityNew;
virIdentitySetCurrent; virIdentitySetCurrent;
virIdentitySetGroupName; virIdentitySetGroupName;

29
src/util/viridentity.c
View File

@ -297,35 +297,6 @@ virIdentityGetAttr(virIdentityPtr ident,
} }
/**
* virIdentityIsEqual:
* @identA: the first identity
* @identB: the second identity
*
* Compares every attribute in @identA and @identB
* to determine if they refer to the same identity
*
* Returns true if they are equal, false if not equal
*/
bool virIdentityIsEqual(virIdentityPtr identA,
virIdentityPtr identB)
{
bool ret = false;
size_t i;
VIR_DEBUG("identA=%p identB=%p", identA, identB);
for (i = 0; i < VIR_IDENTITY_ATTR_LAST; i++) {
if (STRNEQ_NULLABLE(identA->attrs[i],
identB->attrs[i]))
goto cleanup;
}
ret = true;
cleanup:
return ret;
}
int virIdentityGetUserName(virIdentityPtr ident, int virIdentityGetUserName(virIdentityPtr ident,
const char **username) const char **username)
{ {

6
src/util/viridentity.h
View File

@ -33,12 +33,6 @@ virIdentityPtr virIdentityGetSystem(void);
virIdentityPtr virIdentityNew(void); virIdentityPtr virIdentityNew(void);
bool virIdentityIsEqual(virIdentityPtr identA,
virIdentityPtr identB)
ATTRIBUTE_NONNULL(1)
ATTRIBUTE_NONNULL(2);
int virIdentityGetUserName(virIdentityPtr ident, int virIdentityGetUserName(virIdentityPtr ident,
const char **username); const char **username);
int virIdentityGetUNIXUserID(virIdentityPtr ident, int virIdentityGetUNIXUserID(virIdentityPtr ident,

59
tests/viridentitytest.c
View File

@ -84,63 +84,6 @@ static int testIdentityAttrs(const void *data ATTRIBUTE_UNUSED)
} }
static int testIdentityEqual(const void *data ATTRIBUTE_UNUSED)
{
int ret = -1;
virIdentityPtr identa = NULL;
virIdentityPtr identb = NULL;
if (!(identa = virIdentityNew()))
goto cleanup;
if (!(identb = virIdentityNew()))
goto cleanup;
if (!virIdentityIsEqual(identa, identb)) {
VIR_DEBUG("Empty identities were not equal");
goto cleanup;
}
if (virIdentitySetUserName(identa, "fred") < 0)
goto cleanup;
if (virIdentityIsEqual(identa, identb)) {
VIR_DEBUG("Mis-matched identities should not be equal");
goto cleanup;
}
if (virIdentitySetUserName(identb, "fred") < 0)
goto cleanup;
if (!virIdentityIsEqual(identa, identb)) {
VIR_DEBUG("Matched identities were not equal");
goto cleanup;
}
if (virIdentitySetGroupName(identa, "flintstone") < 0)
goto cleanup;
if (virIdentitySetGroupName(identb, "flintstone") < 0)
goto cleanup;
if (!virIdentityIsEqual(identa, identb)) {
VIR_DEBUG("Matched identities were not equal");
goto cleanup;
}
if (virIdentitySetSASLUserName(identb, "fred@FLINTSTONE.COM") < 0)
goto cleanup;
if (virIdentityIsEqual(identa, identb)) {
VIR_DEBUG("Mis-matched identities should not be equal");
goto cleanup;
}
ret = 0;
cleanup:
virObjectUnref(identa);
virObjectUnref(identb);
return ret;
}
static int testIdentityGetSystem(const void *data) static int testIdentityGetSystem(const void *data)
{ {
const char *context = data; const char *context = data;
@ -204,8 +147,6 @@ mymain(void)
if (virTestRun("Identity attributes ", testIdentityAttrs, NULL) < 0) if (virTestRun("Identity attributes ", testIdentityAttrs, NULL) < 0)
ret = -1; ret = -1;
if (virTestRun("Identity equality ", testIdentityEqual, NULL) < 0)
ret = -1;
if (virTestRun("Setting fake SELinux context ", testSetFakeSELinuxContext, context) < 0) if (virTestRun("Setting fake SELinux context ", testSetFakeSELinuxContext, context) < 0)
ret = -1; ret = -1;
if (virTestRun("System identity (fake SELinux enabled) ", testIdentityGetSystem, context) < 0) if (virTestRun("System identity (fake SELinux enabled) ", testIdentityGetSystem, context) < 0)