>From 4d2fafa40252962eb63a3d49ea111a050d2fa2ec Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 17 Jul 2013 16:18:04 +0200 Subject: [PATCH 11/16] Fix formating of variables with type: rlim_t --- src/responder/common/responder_common.c | 11 ++++++----- src/util/sss_format.h | 7 +++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c index 58a92f973114c83a44049fc91f11702bc4e45435..f0524f29c8a11eb492fdb88ff6b834e92c4f8d16 100644 --- a/src/responder/common/responder_common.c +++ b/src/responder/common/responder_common.c @@ -43,6 +43,7 @@ #include "providers/data_provider.h" #include "monitor/monitor_interfaces.h" #include "sbus/sbus_client.h" +#include "util/sss_format.h" static errno_t set_nonblocking(int fd) { @@ -999,7 +1000,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 [%"PRIrlim"]\n", new_limit.rlim_cur)); return; } @@ -1012,7 +1013,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: [%"PRIrlim"]\n", current_limit.rlim_cur)); /* Choose the lesser of the requested and the hard limit */ if (current_limit.rlim_max < fd_limit) { @@ -1025,12 +1026,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 [%"PRIrlim"]\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 " + "[%"PRIrlim"]\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 c9837a6e9d2f950d6d1f12d7727d43ca4b18f62e..67194393be0d4401f3bd2cf1476fedff23b5f727 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 PRIkey_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 PRIrlim PRIu64 + #endif /* __SSS_FORMAT_H__ */ -- 1.8.3.1