Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/locking/lock_daemon.c | 20 ++++++++++----------
src/locking/lock_daemon_dispatch.c | 2 +-
src/locking/lock_driver_sanlock.c | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 7afff42246eb..49d3bcea2f8f 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -692,8 +692,8 @@ virLockDaemonClientFree(void *opaque)
VIR_DEBUG("priv=%p client=%lld owner=%lld",
priv,
- (unsigned long long)priv->clientPid,
- (unsigned long long)priv->ownerPid);
+ (unsigned long long) priv->clientPid,
+ (unsigned long long) priv->ownerPid);
/* If client & owner match, this is the lock holder */
if (priv->clientPid == priv->ownerPid) {
@@ -730,7 +730,7 @@ virLockDaemonClientFree(void *opaque)
break;
VIR_WARN("Failed to kill off pid %lld",
- (unsigned long long)priv->clientPid);
+ (unsigned long long) priv->clientPid);
}
usleep(200 * 1000);
}
@@ -769,21 +769,21 @@ virLockDaemonClientNew(virNetServerClientPtr client,
goto error;
VIR_DEBUG("New client pid %llu uid %llu",
- (unsigned long long)priv->clientPid,
- (unsigned long long)clientuid);
+ (unsigned long long) priv->clientPid,
+ (unsigned long long) clientuid);
if (!privileged) {
if (geteuid() != clientuid) {
virReportRestrictedError(_("Disallowing client %llu with uid
%llu"),
- (unsigned long long)priv->clientPid,
- (unsigned long long)clientuid);
+ (unsigned long long) priv->clientPid,
+ (unsigned long long) clientuid);
goto error;
}
} else {
if (clientuid != 0) {
virReportRestrictedError(_("Disallowing client %llu with uid
%llu"),
- (unsigned long long)priv->clientPid,
- (unsigned long long)clientuid);
+ (unsigned long long) priv->clientPid,
+ (unsigned long long) clientuid);
goto error;
}
}
@@ -942,7 +942,7 @@ virLockDaemonGetExecRestartMagic(void)
{
char *ret;
- ignore_value(virAsprintf(&ret, "%lld", (long long int)getpid()));
+ ignore_value(virAsprintf(&ret, "%lld", (long long int) getpid()));
return ret;
}
diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index 1b479db55dd4..6d117a2e1a04 100644
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -285,7 +285,7 @@ virLockSpaceProtocolDispatchRegister(virNetServerPtr server
ATTRIBUTE_UNUSED,
priv->ownerId = args->owner.id;
priv->ownerPid = args->owner.pid;
VIR_DEBUG("ownerName=%s ownerId=%d ownerPid=%lld",
- priv->ownerName, priv->ownerId, (unsigned long
long)priv->ownerPid);
+ priv->ownerName, priv->ownerId, (unsigned long long)
priv->ownerPid);
rv = 0;
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 345cf0a77257..fa8b25e04208 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -1007,7 +1007,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock,
SANLK_NAME_LEN - 1, SANLK_NAME_LEN));
if (state && STRNEQ(state, "")) {
- if ((rv = sanlock_state_to_args((char *)state,
+ if ((rv = sanlock_state_to_args((char *) state,
&res_count,
&res_args)) < 0) {
char *err = NULL;
--
2.17.0