From 99ff59b39eafecb20063a06704caf17e767c34ab Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Thu, 17 May 2018 21:03:31 +0100 Subject: [PATCH 15/39] config / logrotate: fix couple printf format specifiers reason: fix couple printf format specifiers https://github.com/logrotate/logrotate/pull/200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All of these are are warnings similar to one below. config.c:369:59: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘uid_t’ {aka ‘unsigned int’} [-Wformat=] Signed-off-by: Sami Kerola Closes #200 --- config.c | 2 +- logrotate.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.c b/config.c index 4162cca..53b7416 100644 --- a/config.c +++ b/config.c @@ -360,7 +360,7 @@ static int do_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid) { if (mkdir(path, mode) == 0) { /* newly created directory, set the owner and permissions */ if (chown(path, uid, gid) != 0) { - message(MESS_ERROR, "error setting owner of %s to uid %d and gid %d: %s\n", + message(MESS_ERROR, "error setting owner of %s to uid %u and gid %u: %s\n", path, uid, gid, strerror(errno)); return -1; } diff --git a/logrotate.c b/logrotate.c index 01836cf..4fd546f 100644 --- a/logrotate.c +++ b/logrotate.c @@ -156,10 +156,10 @@ int switch_user(uid_t user, gid_t group) { save_euid = geteuid(); if (save_euid == user && save_egid == group) return 0; - message(MESS_DEBUG, "switching euid to %d and egid to %d\n", + message(MESS_DEBUG, "switching euid to %u and egid to %u\n", user, group); if (setegid(group) || seteuid(user)) { - message(MESS_ERROR, "error switching euid to %d and egid to %d: %s\n", + message(MESS_ERROR, "error switching euid to %u and egid to %u: %s\n", user, group, strerror(errno)); return 1; } @@ -179,10 +179,10 @@ static int switch_user_permanently(const struct logInfo *log) { message(MESS_ERROR, "error getting rid of euid != uid\n"); return 1; } - message(MESS_DEBUG, "switching uid to %d and gid to %d\n", + message(MESS_DEBUG, "switching uid to %u and gid to %u\n", user, group); if (setgid(group) || setuid(user)) { - message(MESS_ERROR, "error switching euid to %d and egid to %d: %s\n", + message(MESS_ERROR, "error switching euid to %u and egid to %u: %s\n", user, group, strerror(errno)); return 1; } @@ -239,7 +239,7 @@ static int allocateHash(unsigned int hs) if (hs < HASH_SIZE_MIN) hs = HASH_SIZE_MIN; - message(MESS_DEBUG, "Allocating hash table for state file, size %d entries\n", + message(MESS_DEBUG, "Allocating hash table for state file, size %u entries\n", hs); states = calloc(hs, sizeof(struct logStateList *)); @@ -540,7 +540,7 @@ static int createOutputFile(char *fileName, int flags, struct stat *sb, if ((sb_create.st_uid != sb->st_uid || sb_create.st_gid != sb->st_gid) && fchown(fd, sb->st_uid, sb->st_gid)) { - message(MESS_ERROR, "error setting owner of %s to uid %d and gid %d: %s\n", + message(MESS_ERROR, "error setting owner of %s to uid %u and gid %u: %s\n", fileName, sb->st_uid, sb->st_gid, strerror(errno)); close(fd); return -1; @@ -1993,7 +1993,7 @@ static int rotateLogSet(struct logInfo *log, int force) message(MESS_DEBUG, "%jd bytes ", (intmax_t)log->threshold); break; default: - message(MESS_DEBUG, "rotateLogSet() does not have case for: %d ", log->criterium); + message(MESS_DEBUG, "rotateLogSet() does not have case for: %u ", log->criterium); } } -- 1.8.3.1