From: Martin Kletzander Date: Mon, 19 Nov 2018 21:31:01 +0000 (+0100) Subject: util: Fix virDoes*Exist return type X-Git-Tag: v4.10.0-rc1~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88a109a17da706126d045a0266acab2ad85e2f7c;p=thirdparty%2Flibvirt.git util: Fix virDoes*Exist return type Since the functions only return 0 or 1, they should return bool. I missed the change when "refactoring" the first commit. Signed-off-by: Martin Kletzander --- diff --git a/src/util/virutil.c b/src/util/virutil.c index c0783ecb28..974cffc2ee 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1133,7 +1133,7 @@ virGetGroupID(const char *group, gid_t *gid) /* Silently checks if User @name exists. * Returns if the user exists and fallbacks to false on error. */ -int +bool virDoesUserExist(const char *name) { return virGetUserIDByName(name, NULL, true) == 0; @@ -1142,7 +1142,7 @@ virDoesUserExist(const char *name) /* Silently checks if Group @name exists. * Returns if the group exists and fallbacks to false on error. */ -int +bool virDoesGroupExist(const char *name) { return virGetGroupIDByName(name, NULL, true) == 0; @@ -1243,16 +1243,16 @@ virGetGroupList(uid_t uid ATTRIBUTE_UNUSED, gid_t gid ATTRIBUTE_UNUSED, return 0; } -int +bool virDoesUserExist(const char *name ATTRIBUTE_UNUSED) { - return 0; + return false; } -int +bool virDoesGroupExist(const char *name ATTRIBUTE_UNUSED) { - return 0; + return false; } # ifdef WIN32 diff --git a/src/util/virutil.h b/src/util/virutil.h index 2407f54efd..e0ab0da0f2 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -152,8 +152,8 @@ int virGetUserID(const char *name, int virGetGroupID(const char *name, gid_t *gid) ATTRIBUTE_RETURN_CHECK; -int virDoesUserExist(const char *name); -int virDoesGroupExist(const char *name); +bool virDoesUserExist(const char *name); +bool virDoesGroupExist(const char *name); bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);