* Merge in cygwin-64bit-branch.
This commit is contained in:
@@ -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 : "<NULL>", logopt, facility);
|
||||
ident ? ident : "<NULL>", 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';
|
||||
|
||||
|
Reference in New Issue
Block a user