External/libvirt
1
0
Fork 0
Code

network: convert virFileLinkPointsTo to return bool

Browse Source 
Convert prototype of virFileLinkPointsTo to return bool.
Remove dead checks in virDomainObjListLoadConfig and
virNetworkLoadConfig.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Anastasia Belova 2023-12-07 12:09:38 +03:00 committed by Martin Kletzander
parent a949a53e13
commit d17474a5f1
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/virdomainobjlist.c
View File

@ -497,8 +497,7 @@ virDomainObjListLoadConfig(virDomainObjList *doms,
if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL)
return NULL; return NULL;
if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) autostart = virFileLinkPointsTo(autostartLink, configFile);
return NULL;
if (!(dom = virDomainObjListAddLocked(doms, &def, xmlopt, 0, &oldDef))) if (!(dom = virDomainObjListAddLocked(doms, &def, xmlopt, 0, &oldDef)))
return NULL; return NULL;

3
src/conf/virnetworkobj.c
View File

@ -945,8 +945,7 @@ virNetworkLoadConfig(virNetworkObjList *nets,
if ((autostartLink = virNetworkConfigFile(autostartDir, name)) == NULL) if ((autostartLink = virNetworkConfigFile(autostartDir, name)) == NULL)
return NULL; return NULL;
if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) autostart = virFileLinkPointsTo(autostartLink, configFile);
return NULL;
if (!(def = virNetworkDefParse(NULL, configFile, xmlopt, false))) if (!(def = virNetworkDefParse(NULL, configFile, xmlopt, false)))
return NULL; return NULL;

2
src/util/virfile.c
View File

@ -1697,7 +1697,7 @@ virFileWriteStr(const char *path, const char *str, mode_t mode)
/* Return nonzero if checkLink and checkDest /* Return nonzero if checkLink and checkDest
* refer to the same file. Otherwise, return 0. * refer to the same file. Otherwise, return 0.
*/ */
int bool
virFileLinkPointsTo(const char *checkLink, virFileLinkPointsTo(const char *checkLink,
const char *checkDest) const char *checkDest)
{ {

4
src/util/virfile.h
View File

@ -176,8 +176,8 @@ int virFileReadBufQuiet(const char *file, char *buf, int len)
int virFileWriteStr(const char *path, const char *str, mode_t mode) int virFileWriteStr(const char *path, const char *str, mode_t mode)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
int virFileLinkPointsTo(const char *checkLink, bool virFileLinkPointsTo(const char *checkLink,
const char *checkDest) const char *checkDest)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int virFileRelLinkPointsTo(const char *directory, int virFileRelLinkPointsTo(const char *directory,
const char *checkLink, const char *checkLink,