Get rid of shadowed booleans

There are still two places where we are using 1bit width unsigned
integer to store a boolean. There's no real need for this and these
occurrences can be replaced with 'bool'.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2013-10-22 10:33:06 +01:00
parent 5a0ea4b7b9
commit e3e9d3b1be
2 changed files with 6 additions and 6 deletions

View File

@ -164,7 +164,7 @@ typedef virInterfaceObj *virInterfaceObjPtr;
struct _virInterfaceObj { struct _virInterfaceObj {
virMutex lock; virMutex lock;
unsigned int active:1; /* 1 if interface is active (up) */ bool active; /* true if interface is active (up) */
virInterfaceDefPtr def; /* The interface definition */ virInterfaceDefPtr def; /* The interface definition */
}; };
@ -175,7 +175,7 @@ struct _virInterfaceObjList {
virInterfaceObjPtr *objs; virInterfaceObjPtr *objs;
}; };
static inline int static inline bool
virInterfaceObjIsActive(const virInterfaceObj *iface) virInterfaceObjIsActive(const virInterfaceObj *iface)
{ {
return iface->active; return iface->active;

View File

@ -95,7 +95,7 @@ struct _virNetServer {
unsigned int keepaliveCount; unsigned int keepaliveCount;
bool keepaliveRequired; bool keepaliveRequired;
unsigned int quit :1; bool quit;
#ifdef WITH_GNUTLS #ifdef WITH_GNUTLS
virNetTLSContextPtr tls; virNetTLSContextPtr tls;
@ -1035,7 +1035,7 @@ static void virNetServerAutoShutdownTimer(int timerid ATTRIBUTE_UNUSED,
if (!srv->autoShutdownInhibitions) { if (!srv->autoShutdownInhibitions) {
VIR_DEBUG("Automatic shutdown triggered"); VIR_DEBUG("Automatic shutdown triggered");
srv->quit = 1; srv->quit = true;
} }
virObjectUnlock(srv); virObjectUnlock(srv);
@ -1074,7 +1074,7 @@ void virNetServerRun(virNetServerPtr srv)
virNetServerMDNSStart(srv->mdns) < 0) virNetServerMDNSStart(srv->mdns) < 0)
goto cleanup; goto cleanup;
srv->quit = 0; srv->quit = false;
if (srv->autoShutdownTimeout && if (srv->autoShutdownTimeout &&
(timerid = virEventAddTimeout(-1, (timerid = virEventAddTimeout(-1,
@ -1162,7 +1162,7 @@ void virNetServerQuit(virNetServerPtr srv)
virObjectLock(srv); virObjectLock(srv);
VIR_DEBUG("Quit requested %p", srv); VIR_DEBUG("Quit requested %p", srv);
srv->quit = 1; srv->quit = true;
virObjectUnlock(srv); virObjectUnlock(srv);
} }