aboutsummaryrefslogtreecommitdiff
path: root/util/messages.c
diff options
context:
space:
mode:
Diffstat (limited to 'util/messages.c')
-rw-r--r--util/messages.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/util/messages.c b/util/messages.c
index ef920b2..3592692 100644
--- a/util/messages.c
+++ b/util/messages.c
@@ -107,9 +107,9 @@ const char *message_program_name = NULL;
* handler list, the count of handlers, and the argument list.
*/
static void
-message_handlers(message_handler_func **list, int count, va_list args)
+message_handlers(message_handler_func **list, unsigned int count, va_list args)
{
- int i;
+ unsigned int i;
if (*list != stdout_handlers && *list != stderr_handlers)
free(*list);
@@ -127,7 +127,7 @@ message_handlers(message_handler_func **list, int count, va_list args)
*/
#define HANDLER_FUNCTION(type) \
void \
- message_handlers_ ## type(int count, ...) \
+ message_handlers_ ## type(unsigned int count, ...) \
{ \
va_list args; \
\
@@ -145,7 +145,7 @@ HANDLER_FUNCTION(die)
* Print a message to stdout, supporting message_program_name.
*/
void
-message_log_stdout(int len UNUSED, const char *fmt, va_list args, int err)
+message_log_stdout(size_t len UNUSED, const char *fmt, va_list args, int err)
{
if (message_program_name != NULL)
fprintf(stdout, "%s: ", message_program_name);
@@ -162,7 +162,7 @@ message_log_stdout(int len UNUSED, const char *fmt, va_list args, int err)
* stdout so that errors and regular output occur in the right order.
*/
void
-message_log_stderr(int len UNUSED, const char *fmt, va_list args, int err)
+message_log_stderr(size_t len UNUSED, const char *fmt, va_list args, int err)
{
fflush(stdout);
if (message_program_name != NULL)
@@ -183,7 +183,7 @@ message_log_stderr(int len UNUSED, const char *fmt, va_list args, int err)
* log the errno information.
*/
static void
-message_log_syslog(int pri, int len, const char *fmt, va_list args, int err)
+message_log_syslog(int pri, size_t len, const char *fmt, va_list args, int err)
{
char *buffer;
@@ -218,11 +218,11 @@ message_log_syslog(int pri, int len, const char *fmt, va_list args, int err)
* Do the same sort of wrapper to generate all of the separate syslog logging
* functions.
*/
-#define SYSLOG_FUNCTION(name, type) \
- void \
- message_log_syslog_ ## name(int l, const char *f, va_list a, int e) \
- { \
- message_log_syslog(LOG_ ## type, l, f, a, e); \
+#define SYSLOG_FUNCTION(name, type) \
+ void \
+ message_log_syslog_ ## name(size_t l, const char *f, va_list a, int e) \
+ { \
+ message_log_syslog(LOG_ ## type, l, f, a, e); \
}
SYSLOG_FUNCTION(debug, DEBUG)
SYSLOG_FUNCTION(info, INFO)
@@ -243,7 +243,7 @@ debug(const char *format, ...)
{
va_list args;
message_handler_func *log;
- int length;
+ ssize_t length;
if (debug_handlers == NULL)
return;
@@ -254,7 +254,7 @@ debug(const char *format, ...)
return;
for (log = debug_handlers; *log != NULL; log++) {
va_start(args, format);
- (**log)(length, format, args, 0);
+ (**log)((size_t) length, format, args, 0);
va_end(args);
}
}
@@ -264,7 +264,7 @@ notice(const char *format, ...)
{
va_list args;
message_handler_func *log;
- int length;
+ ssize_t length;
va_start(args, format);
length = vsnprintf(NULL, 0, format, args);
@@ -273,7 +273,7 @@ notice(const char *format, ...)
return;
for (log = notice_handlers; *log != NULL; log++) {
va_start(args, format);
- (**log)(length, format, args, 0);
+ (**log)((size_t) length, format, args, 0);
va_end(args);
}
}
@@ -283,7 +283,7 @@ sysnotice(const char *format, ...)
{
va_list args;
message_handler_func *log;
- int length;
+ ssize_t length;
int error = errno;
va_start(args, format);
@@ -293,7 +293,7 @@ sysnotice(const char *format, ...)
return;
for (log = notice_handlers; *log != NULL; log++) {
va_start(args, format);
- (**log)(length, format, args, error);
+ (**log)((size_t) length, format, args, error);
va_end(args);
}
}
@@ -303,7 +303,7 @@ warn(const char *format, ...)
{
va_list args;
message_handler_func *log;
- int length;
+ ssize_t length;
va_start(args, format);
length = vsnprintf(NULL, 0, format, args);
@@ -312,7 +312,7 @@ warn(const char *format, ...)
return;
for (log = warn_handlers; *log != NULL; log++) {
va_start(args, format);
- (**log)(length, format, args, 0);
+ (**log)((size_t) length, format, args, 0);
va_end(args);
}
}
@@ -322,7 +322,7 @@ syswarn(const char *format, ...)
{
va_list args;
message_handler_func *log;
- int length;
+ ssize_t length;
int error = errno;
va_start(args, format);
@@ -332,7 +332,7 @@ syswarn(const char *format, ...)
return;
for (log = warn_handlers; *log != NULL; log++) {
va_start(args, format);
- (**log)(length, format, args, error);
+ (**log)((size_t) length, format, args, error);
va_end(args);
}
}
@@ -342,7 +342,7 @@ die(const char *format, ...)
{
va_list args;
message_handler_func *log;
- int length;
+ ssize_t length;
va_start(args, format);
length = vsnprintf(NULL, 0, format, args);
@@ -350,7 +350,7 @@ die(const char *format, ...)
if (length >= 0)
for (log = die_handlers; *log != NULL; log++) {
va_start(args, format);
- (**log)(length, format, args, 0);
+ (**log)((size_t) length, format, args, 0);
va_end(args);
}
exit(message_fatal_cleanup ? (*message_fatal_cleanup)() : 1);
@@ -361,7 +361,7 @@ sysdie(const char *format, ...)
{
va_list args;
message_handler_func *log;
- int length;
+ ssize_t length;
int error = errno;
va_start(args, format);
@@ -370,7 +370,7 @@ sysdie(const char *format, ...)
if (length >= 0)
for (log = die_handlers; *log != NULL; log++) {
va_start(args, format);
- (**log)(length, format, args, error);
+ (**log)((size_t) length, format, args, error);
va_end(args);
}
exit(message_fatal_cleanup ? (*message_fatal_cleanup)() : 1);
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 21:42:29 +0000