>From 2746a7dba87c53cd810a285ab2f3f2ac7a0d1e35 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 17 Jul 2013 16:18:04 +0200 Subject: [PATCH 10/19] Fix formating of variables with type: rlim_t --- src/responder/common/responder_common.c | 10 +++++----- src/util/sss_format.h | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c index 58a92f973114c83a44049fc91f11702bc4e45435..908031a0de7fb4df0f415b9b4adf94457d7f7e26 100644 --- a/src/responder/common/responder_common.c +++ b/src/responder/common/responder_common.c @@ -999,7 +999,7 @@ void responder_set_fd_limit(rlim_t fd_limit) limret = setrlimit(RLIMIT_NOFILE, &new_limit); if (limret == 0) { DEBUG(SSSDBG_CONF_SETTINGS, - ("Maximum file descriptors set to [%d]\n", + ("Maximum file descriptors set to [%"SPRIrlim"]\n", new_limit.rlim_cur)); return; } @@ -1012,7 +1012,7 @@ void responder_set_fd_limit(rlim_t fd_limit) limret = getrlimit(RLIMIT_NOFILE, ¤t_limit); if (limret == 0) { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Current fd limit: [%d]\n", + ("Current fd limit: [%"SPRIrlim"]\n", current_limit.rlim_cur)); /* Choose the lesser of the requested and the hard limit */ if (current_limit.rlim_max < fd_limit) { @@ -1025,12 +1025,12 @@ void responder_set_fd_limit(rlim_t fd_limit) limret = setrlimit(RLIMIT_NOFILE, &new_limit); if (limret == 0) { DEBUG(SSSDBG_CONF_SETTINGS, - ("Maximum file descriptors set to [%d]\n", + ("Maximum file descriptors set to [%"SPRIrlim"]\n", new_limit.rlim_cur)); } else { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not set new fd limits. Proceeding with [%d]\n", - current_limit.rlim_cur)); + ("Could not set new fd limits. Proceeding with " + "[%"SPRIrlim"]\n", current_limit.rlim_cur)); } } else { DEBUG(SSSDBG_CRIT_FAILURE, diff --git a/src/util/sss_format.h b/src/util/sss_format.h index ac3d382893fc0a3d623bfdc86ea0efc569e0a725..a922ee367860e85f458672feab4eb3fcd3744b04 100644 --- a/src/util/sss_format.h +++ b/src/util/sss_format.h @@ -32,4 +32,11 @@ /* key_serial_t is defined in keyutils.h as typedef int32_t */ #define SPRIkey_ser PRId32 +/* rlim_t is defined with conditional build as unsigned type. + * It seems that sizeof(rlim_t) is 8. It may be platform dependent, therefore + * the same format will be used like with uint64_t. + */ + +#define SPRIrlim PRIu64 + #endif /* __SSS_FORMAT_H__ */ -- 1.8.3.1