Rewrite two macros to avoid a seemingly false positive from clang -Wint-conversion

The code was weirdly written anyway.  ok ajacoutot@ (maintainer)
This commit is contained in:
jca 2023-01-27 18:51:50 +00:00
parent 505b0a6fbd
commit 9534ca3d75
3 changed files with 29 additions and 0 deletions

View File

@ -1,6 +1,7 @@
COMMENT= tool/library for managing platform virtualization
DISTNAME= libvirt-9.0.0
REVISION= 0
CATEGORIES= sysutils devel emulators

View File

@ -0,0 +1,14 @@
Work around bogus clang -Wint-conversion warning.
Index: src/util/virobject.h
--- src/util/virobject.h.orig
+++ src/util/virobject.h
@@ -145,7 +145,7 @@ virObjectListFreeCount(void *list,
#define VIR_WITH_OBJECT_LOCK_GUARD_(o, name) \
for (g_auto(virLockGuard) name = virObjectLockGuard(o); name.mutex; \
- name.mutex = (virLockGuardUnlock(&name), NULL))
+ virLockGuardUnlock(&name), name.mutex = NULL)
/**
* VIR_WITH_OBJECT_LOCK_GUARD:

View File

@ -0,0 +1,14 @@
Work around bogus clang -Wint-conversion warning.
Index: src/util/virthread.h
--- src/util/virthread.h.orig
+++ src/util/virthread.h
@@ -212,7 +212,7 @@ int virThreadLocalSet(virThreadLocal *l, void*) G_GNUC
#define VIR_WITH_MUTEX_LOCK_GUARD_(m, name) \
for (g_auto(virLockGuard) name = virLockGuardLock(m); name.mutex; \
- name.mutex = (virLockGuardUnlock(&name), NULL))
+ virLockGuardUnlock(&name), name.mutex = NULL)
/**
* VIR_WITH_MUTEX_LOCK_GUARD:
*