From 9bbf7d748e3fc79ac66b496cfda50706228e7c2b Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 6 Jul 2008 15:24:59 +0200 Subject: [PATCH] email plugin: Don't print `pthread_t'. It may be a struct, so printing it is not portable. --- src/email.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/email.c b/src/email.c index 9a934052..0882ad46 100644 --- a/src/email.c +++ b/src/email.c @@ -243,7 +243,6 @@ static void type_list_incr (type_list_t *list, char *name, int incr) static void *collect (void *arg) { collector_t *this = (collector_t *)arg; - pthread_t self = pthread_self (); while (1) { int loop = 1; @@ -269,8 +268,8 @@ static void *collect (void *arg) * thread and connection management */ this->socket = connection->socket; - log_debug ("[thread #%5lu] handling connection on fd #%i", - self, fileno (this->socket)); + log_debug ("collect: handling connection on fd #%i", + fileno (this->socket)); while (loop) { /* 256 bytes ought to be enough for anybody ;-) */ @@ -283,8 +282,8 @@ static void *collect (void *arg) if (0 != errno) { char errbuf[1024]; - log_err ("[thread #%5lu] reading from socket (fd #%i) " - "failed: %s", self, fileno (this->socket), + log_err ("collect: reading from socket (fd #%i) " + "failed: %s", fileno (this->socket), sstrerror (errno, errbuf, sizeof (errbuf))); } break; @@ -292,8 +291,8 @@ static void *collect (void *arg) len = strlen (line); if (('\n' != line[len - 1]) && ('\r' != line[len - 1])) { - log_warn ("[thread #%5lu] line too long (> %lu characters): " - "'%s' (truncated)", self, sizeof (line) - 1, line); + log_warn ("collect: line too long (> %zu characters): " + "'%s' (truncated)", sizeof (line) - 1, line); while (NULL != fgets (line, sizeof (line), this->socket)) if (('\n' == line[len - 1]) || ('\r' == line[len - 1])) @@ -303,11 +302,10 @@ static void *collect (void *arg) line[len - 1] = '\0'; - log_debug ("[thread #%5lu] line = '%s'", self, line); + log_debug ("collect: line = '%s'", line); if (':' != line[1]) { - log_err ("[thread #%5lu] syntax error in line '%s'", - self, line); + log_err ("collect: syntax error in line '%s'", line); continue; } @@ -318,8 +316,7 @@ static void *collect (void *arg) int bytes = 0; if (NULL == tmp) { - log_err ("[thread #%5lu] syntax error in line '%s'", - self, line); + log_err ("collect: syntax error in line '%s'", line); continue; } @@ -353,7 +350,7 @@ static void *collect (void *arg) } while (NULL != (type = strtok_r (NULL, ",", &ptr))); } else { - log_err ("[thread #%5lu] unknown type '%c'", self, line[0]); + log_err ("collect: unknown type '%c'", line[0]); } } /* while (loop) */ -- 2.11.0