From f43bb1dc20f1f2a2f94f7c505e80559ee6fecccd Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 30 May 2013 07:59:14 -0600 Subject: [PATCH] build: cast [ug]id_t when printing This is a recurring problem for cygwin :) For example, see commit 23a4df88. qemu/qemu_driver.c: In function 'qemuStateInitialize': qemu/qemu_driver.c:691:13: error: format '%d' expects type 'int', but argument 8 has type 'uid_t' [-Wformat] * src/qemu/qemu_driver.c (qemuStateInitialize): Add casts. * daemon/remote.c (remoteDispatchAuthList): Likewise. Signed-off-by: Eric Blake --- daemon/remote.c | 4 ++-- src/qemu/qemu_driver.c | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 0e253bfbb4..47267c207b 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1,7 +1,7 @@ /* * remote.c: handlers for RPC method calls * - * Copyright (C) 2007-2012 Red Hat, Inc. + * Copyright (C) 2007-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2354,7 +2354,7 @@ remoteDispatchAuthList(virNetServerPtr server ATTRIBUTE_UNUSED, } else if (callerUid == 0) { char *ident; if (virAsprintf(&ident, "pid:%lld,uid:%d", - (long long) callerPid, callerUid) < 0) { + (long long) callerPid, (int) callerUid) < 0) { virReportOOMError(); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4a76f1407f..d0dee148f5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -690,25 +690,29 @@ qemuStateInitialize(bool privileged, if (chown(cfg->libDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to user %d:%d"), - cfg->libDir, cfg->user, cfg->group); + cfg->libDir, (int) cfg->user, + (int) cfg->group); goto error; } if (chown(cfg->cacheDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->cacheDir, cfg->user, cfg->group); + cfg->cacheDir, (int) cfg->user, + (int) cfg->group); goto error; } if (chown(cfg->saveDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->saveDir, cfg->user, cfg->group); + cfg->saveDir, (int) cfg->user, + (int) cfg->group); goto error; } if (chown(cfg->snapshotDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->snapshotDir, cfg->user, cfg->group); + cfg->snapshotDir, (int) cfg->user, + (int) cfg->group); goto error; } run_uid = cfg->user; @@ -752,8 +756,8 @@ qemuStateInitialize(bool privileged, if (chown(mempath, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership on %s to %d:%d"), - mempath, cfg->user, - cfg->group); + mempath, (int) cfg->user, + (int) cfg->group); goto error; } } -- 2.39.5