>From ad4b85cdab9be4a008e821e14aed75ec6543e1da Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 17 Jul 2013 13:00:49 +0200 Subject: [PATCH 06/20] Fix formating of variables with type: ssize_t --- src/providers/ipa/ipa_selinux.c | 4 ++-- src/providers/krb5/krb5_child_handler.c | 2 +- src/providers/krb5/krb5_common.c | 4 ++-- src/tools/files.c | 2 +- src/util/backup_file.c | 2 +- src/util/child_common.c | 3 ++- src/util/server.c | 4 ++-- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c index 39bebebfd8f4880c4093dfd922f2dfaa79c38a2e..5f734338b8fb43d6d99ba9adcb25c655f8cb1951 100644 --- a/src/providers/ipa/ipa_selinux.c +++ b/src/providers/ipa/ipa_selinux.c @@ -672,7 +672,7 @@ static errno_t write_selinux_login_file(const char *username, char *string) char *path = NULL; char *tmp_path = NULL; ssize_t written; - int len; + size_t len; int fd = -1; mode_t oldmask; TALLOC_CTX *tmp_ctx; @@ -743,7 +743,7 @@ static errno_t write_selinux_login_file(const char *username, char *string) } if (written != len) { - DEBUG(SSSDBG_OP_FAILURE, ("Expected to write %d bytes, wrote %d", + DEBUG(SSSDBG_OP_FAILURE, ("Expected to write %zd bytes, wrote %zu", written, len)); ret = EIO; goto done; diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c index 8117d1e5db01cfe0684ee4d7f3e4acf8ff1e4768..20b83d1372fdf0026b36a4b9877673d3dce25ddd 100644 --- a/src/providers/krb5/krb5_child_handler.c +++ b/src/providers/krb5/krb5_child_handler.c @@ -538,7 +538,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, msg_status, msg_type, msg_len)); if ((p + msg_len) > len) { - DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%d] > [%d].\n", + DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%d] > [%zd].\n", p+msg_len, len)); return EINVAL; } diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index e6fbe99529394be7edcec6500ec7ba33ca2d60ac..5a43983d157818d8164cdca009e219cf64462e69 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -417,7 +417,7 @@ errno_t write_krb5info_file(const char *realm, const char *server, char *krb5info_name = NULL; TALLOC_CTX *tmp_ctx = NULL; const char *name_tmpl = NULL; - int server_len; + size_t server_len; ssize_t written; mode_t old_umask; @@ -478,7 +478,7 @@ errno_t write_krb5info_file(const char *realm, const char *server, if (written != server_len) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Write error, wrote [%d] bytes, expected [%d]\n", + ("Write error, wrote [%zd] bytes, expected [%zu]\n", written, server_len)); ret = EIO; goto done; diff --git a/src/tools/files.c b/src/tools/files.c index ff04d09f8ba14802098b8177dc7c905fa75f4e80..7fc8422817f0cb4365da6404b7eb15c6e3bfb253 100644 --- a/src/tools/files.c +++ b/src/tools/files.c @@ -408,7 +408,7 @@ copy_file(int ifd, if (written != cnt) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Wrote %d bytes, expected %d\n", written, cnt)); + ("Wrote %zd bytes, expected %zd\n", written, cnt)); goto done; } } diff --git a/src/util/backup_file.c b/src/util/backup_file.c index edbf868cb8f68ca534c257a6dfc761dc9fd025f2..316c1cfe8023c90b3ceb4d6a514754999f87c45b 100644 --- a/src/util/backup_file.c +++ b/src/util/backup_file.c @@ -103,7 +103,7 @@ int backup_file(const char *src_file, int dbglvl) } if (written != numread) { - DEBUG(dbglvl, ("Wrote %d bytes expected %d bytes\n", + DEBUG(dbglvl, ("Wrote %zd bytes expected %zd bytes\n", written, numread)); ret = EIO; goto done; diff --git a/src/util/child_common.c b/src/util/child_common.c index 2bd2bbc3a557ea61c3bcf517a48b3673bd3d6d4f..28358606b0ba8b5fa6a28450f3111b68f8668fbf 100644 --- a/src/util/child_common.c +++ b/src/util/child_common.c @@ -484,7 +484,8 @@ static void read_pipe_handler(struct tevent_context *ev, return; } else { - DEBUG(1, ("unexpected return value of read [%d].\n", size)); + DEBUG(SSSDBG_CRIT_FAILURE, + ("unexpected return value of read [%zd].\n", size)); tevent_req_error(req, EINVAL); return; } diff --git a/src/util/server.c b/src/util/server.c index 9d3c9cb04dcac2f823982c31cac832fb473b720c..a33207b3da8a713d90dbd840475ecdb75f1fff0c 100644 --- a/src/util/server.c +++ b/src/util/server.c @@ -147,7 +147,7 @@ int pidfile(const char *path, const char *name) int fd; int ret, err; ssize_t len; - ssize_t size; + size_t size; ssize_t written; ssize_t pidlen = sizeof(pid_str) - 1; @@ -227,7 +227,7 @@ int pidfile(const char *path, const char *name) if (written != size) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Wrote %d bytes expected %d\n", written, size)); + ("Wrote %zd bytes expected %zu\n", written, size)); close(fd); return EIO; } -- 1.8.3.1