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-5.7'
[collectd.git]
/
src
/
email.c
diff --git
a/src/email.c
b/src/email.c
index
72a8d6e
..
52e41a7
100644
(file)
--- a/
src/email.c
+++ b/
src/email.c
@@
-357,7
+357,7
@@
static void *collect(void *arg) {
} /* while (1) */
pthread_exit((void *)0);
} /* while (1) */
pthread_exit((void *)0);
- return (
(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) {
@@
-403,7
+403,7
@@
static void *open_connection(void __attribute__((unused)) * arg) {
{
struct group sg;
struct group *grp;
{
struct group sg;
struct group *grp;
- char grbuf[
2048
];
+ char grbuf[
4096
];
int status;
grp = NULL;
int status;
grp = NULL;
@@
-411,7
+411,7
@@
static void *open_connection(void __attribute__((unused)) * arg) {
if (status != 0) {
char errbuf[1024];
log_warn("getgrnam_r (%s) failed: %s", group,
if (status != 0) {
char errbuf[1024];
log_warn("getgrnam_r (%s) failed: %s", group,
- sstrerror(
errno
, errbuf, sizeof(errbuf)));
+ sstrerror(
status
, errbuf, sizeof(errbuf)));
} else if (grp == NULL) {
log_warn("No such group: `%s'", group);
} else {
} else if (grp == NULL) {
log_warn("No such group: `%s'", group);
} else {
@@
-527,7
+527,7
@@
static void *open_connection(void __attribute__((unused)) * arg) {
}
pthread_exit((void *)0);
}
pthread_exit((void *)0);
- return (
(void *)0)
;
+ return (
void *)0
;
} /* static void *open_connection (void *) */
static int email_init(void) {
} /* static void *open_connection (void *) */
static int email_init(void) {
@@
-537,10
+537,10
@@
static int email_init(void) {
disabled = 1;
log_err("plugin_thread_create() failed: %s",
sstrerror(errno, errbuf, sizeof(errbuf)));
disabled = 1;
log_err("plugin_thread_create() failed: %s",
sstrerror(errno, errbuf, sizeof(errbuf)));
- return
(-1)
;
+ return
-1
;
}
}
- return
(0)
;
+ return
0
;
} /* int email_init */
static void type_list_free(type_list_t *t) {
} /* int email_init */
static void type_list_free(type_list_t *t) {
@@
-609,7
+609,7
@@
static int email_shutdown(void) {
sfree(sock_file);
sfree(sock_group);
sfree(sock_file);
sfree(sock_group);
- return
(0)
;
+ return
0
;
} /* static void email_shutdown (void) */
static void email_submit(const char *type, const char *type_instance,
} /* static void email_shutdown (void) */
static void email_submit(const char *type, const char *type_instance,
@@
-663,7
+663,7
@@
static int email_read(void) {
int score_count_old;
if (disabled)
int score_count_old;
if (disabled)
- return
(-1)
;
+ return
-1
;
/* email count */
pthread_mutex_lock(&count_mutex);
/* email count */
pthread_mutex_lock(&count_mutex);
@@
-710,7
+710,7
@@
static int email_read(void) {
for (type_t *ptr = list_check_copy.head; NULL != ptr; ptr = ptr->next)
email_submit("spam_check", ptr->name, ptr->value);
for (type_t *ptr = list_check_copy.head; NULL != ptr; ptr = ptr->next)
email_submit("spam_check", ptr->name, ptr->value);
- return
(0)
;
+ return
0
;
} /* int email_read */
void module_register(void) {
} /* int email_read */
void module_register(void) {