projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_sensu: use sstrncpy
[collectd.git]
/
src
/
write_sensu.c
diff --git
a/src/write_sensu.c
b/src/write_sensu.c
index
b0c9254
..
a9f621d
100644
(file)
--- a/
src/write_sensu.c
+++ b/
src/write_sensu.c
@@
-627,7
+627,7
@@
static char *replace_str(const char *str, const char *old, /* {{{ */
r += newlen;
p = q + oldlen;
}
r += newlen;
p = q + oldlen;
}
- s
trncpy(r, p, strlen(p
));
+ s
strncpy(r, p, sizeof(r
));
return ret;
} /* }}} char *replace_str */
return ret;
} /* }}} char *replace_str */
@@
-880,11
+880,9
@@
static int sensu_send_msg(struct sensu_host *host, const char *msg) /* {{{ */
sensu_close_socket(host);
if (status != 0) {
sensu_close_socket(host);
if (status != 0) {
- char errbuf[1024];
ERROR("write_sensu plugin: Sending to Sensu at %s:%s failed: %s",
(host->node != NULL) ? host->node : SENSU_HOST,
ERROR("write_sensu plugin: Sending to Sensu at %s:%s failed: %s",
(host->node != NULL) ? host->node : SENSU_HOST,
- (host->service != NULL) ? host->service : SENSU_PORT,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ (host->service != NULL) ? host->service : SENSU_PORT, STRERRNO);
return -1;
}
return -1;
}
@@
-999,7
+997,10
@@
static void sensu_free(void *p) /* {{{ */
sfree(host->separator);
free_str_list(&(host->metric_handlers));
free_str_list(&(host->notification_handlers));
sfree(host->separator);
free_str_list(&(host->metric_handlers));
free_str_list(&(host->notification_handlers));
+
+ pthread_mutex_unlock(&host->lock);
pthread_mutex_destroy(&host->lock);
pthread_mutex_destroy(&host->lock);
+
sfree(host);
} /* }}} void sensu_free */
sfree(host);
} /* }}} void sensu_free */