From 61522196c71593da09572fce9af9e0d7dad61bc3 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 23 Apr 2013 09:44:36 +0000 Subject: * Merge in cygwin-64bit-branch. --- winsup/cygwin/syslog.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'winsup/cygwin/syslog.cc') diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc index 98b15060d..7949b7001 100644 --- a/winsup/cygwin/syslog.cc +++ b/winsup/cygwin/syslog.cc @@ -45,7 +45,7 @@ openlog (const char *ident, int logopt, int facility) wchar_t *new_ident = NULL; debug_printf ("openlog called with (%s, %d, %d)", - ident ? ident : "", logopt, facility); + ident ? ident : "", logopt, facility); if (ident) { @@ -249,7 +249,7 @@ connect_syslogd () } static int -try_connect_syslogd (int priority, const char *msg, int len) +try_connect_syslogd (int priority, const char *msg, size_t len) { ssize_t ret = -1; @@ -296,11 +296,11 @@ try_connect_syslogd (int priority, const char *msg, int len) extern "C" void vsyslog (int priority, const char *message, va_list ap) { - debug_printf ("%x %s", priority, message); + debug_printf ("%y %s", priority, message); /* If the priority fails the current mask, reject */ if ((LOG_MASK (LOG_PRI (priority)) & syslog_globals.process_logmask) == 0) { - debug_printf ("failing message %x due to priority mask %x", + debug_printf ("failing message %y due to priority mask %y", priority, syslog_globals.process_logmask); return; } @@ -402,7 +402,7 @@ vsyslog (int priority, const char *message, va_list ap) } char *total_msg = pass.get_message (); - int len = strlen (total_msg); + size_t len = strlen (total_msg); if (len != 0 && (total_msg[len - 1] == '\n')) total_msg[--len] = '\0'; -- cgit v1.2.3