projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.3
[collectd.git]
/
src
/
email.c
diff --git
a/src/email.c
b/src/email.c
index
f79217c
..
8f633cd
100644
(file)
--- a/
src/email.c
+++ b/
src/email.c
@@
-360,8
+360,8
@@
static void *collect (void *arg)
}
} /* while (loop) */
}
} /* while (loop) */
- log_debug ("
[thread #%5lu] s
hutting down connection on fd #%i",
-
pthread_self (),
fileno (this->socket));
+ log_debug ("
S
hutting down connection on fd #%i",
+ fileno (this->socket));
fclose (connection->socket);
free (connection);
fclose (connection->socket);
free (connection);
@@
-376,6
+376,7
@@
static void *collect (void *arg)
} /* while (1) */
pthread_exit ((void *)0);
} /* while (1) */
pthread_exit ((void *)0);
+ return ((void *) 0);
} /* static void *collect (void *) */
static void *open_connection (void __attribute__((unused)) *arg)
} /* static void *collect (void *) */
static void *open_connection (void __attribute__((unused)) *arg)
@@
-481,8
+482,8
@@
static void *open_connection (void __attribute__((unused)) *arg)
collectors[i] = (collector_t *)smalloc (sizeof (collector_t));
collectors[i]->socket = NULL;
collectors[i] = (collector_t *)smalloc (sizeof (collector_t));
collectors[i]->socket = NULL;
- if (0 != (err = p
thread_create (&collectors[i]->thread, &ptattr
,
- collect, collectors[i]))) {
+ if (0 != (err = p
lugin_thread_create (&collectors[i]->thread
,
+
&ptattr,
collect, collectors[i]))) {
char errbuf[1024];
log_err ("pthread_create() failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
char errbuf[1024];
log_err ("pthread_create() failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
@@
-548,14
+549,16
@@
static void *open_connection (void __attribute__((unused)) *arg)
pthread_cond_signal (&conn_available);
}
pthread_cond_signal (&conn_available);
}
- pthread_exit ((void *)0);
+
+ pthread_exit ((void *) 0);
+ return ((void *) 0);
} /* static void *open_connection (void *) */
static int email_init (void)
{
int err = 0;
} /* static void *open_connection (void *) */
static int email_init (void)
{
int err = 0;
- if (0 != (err = pthread_create (&connector, NULL,
+ if (0 != (err = p
lugin_
thread_create (&connector, NULL,
open_connection, NULL))) {
char errbuf[1024];
disabled = 1;
open_connection, NULL))) {
char errbuf[1024];
disabled = 1;