projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
71db775
)
curl_json plugin: use sstrerr for thread safety
author
Jim Radford
<radford@galvanix.com>
Thu, 8 Aug 2013 16:31:46 +0000
(09:31 -0700)
committer
Jim Radford
<radford@galvanix.com>
Sat, 10 Aug 2013 19:31:31 +0000
(12:31 -0700)
src/curl_json.c
patch
|
blob
|
history
diff --git
a/src/curl_json.c
b/src/curl_json.c
index
de66862
..
253ca27
100644
(file)
--- a/
src/curl_json.c
+++ b/
src/curl_json.c
@@
-774,6
+774,7
@@
static void cj_submit (cj_t *db, cj_key_t *key, value_t *value) /* {{{ */
static int cj_sock_perform (cj_t *db) /* {{{ */
{
static int cj_sock_perform (cj_t *db) /* {{{ */
{
+ char errbuf[1024];
struct sockaddr_un sa_unix = {};
sa_unix.sun_family = AF_UNIX;
sstrncpy (sa_unix.sun_path, db->sock, sizeof (sa_unix.sun_path));
struct sockaddr_un sa_unix = {};
sa_unix.sun_family = AF_UNIX;
sstrncpy (sa_unix.sun_path, db->sock, sizeof (sa_unix.sun_path));
@@
-784,7
+785,8
@@
static int cj_sock_perform (cj_t *db) /* {{{ */
if (connect (fd, (struct sockaddr *)&sa_unix, sizeof(sa_unix)) < 0)
{
ERROR ("curl_json plugin: connect(%s) failed: %s",
if (connect (fd, (struct sockaddr *)&sa_unix, sizeof(sa_unix)) < 0)
{
ERROR ("curl_json plugin: connect(%s) failed: %s",
- (db->sock != NULL) ? db->sock : "<null>", strerror(errno));
+ (db->sock != NULL) ? db->sock : "<null>",
+ sstrerror(errno, errbuf, sizeof (errbuf)));
close (fd);
return (-1);
}
close (fd);
return (-1);
}
@@
-795,7
+797,8
@@
static int cj_sock_perform (cj_t *db) /* {{{ */
red = read (fd, buffer, sizeof(buffer));
if (red < 0) {
ERROR ("curl_json plugin: read(%s) failed: %s",
red = read (fd, buffer, sizeof(buffer));
if (red < 0) {
ERROR ("curl_json plugin: read(%s) failed: %s",
- (db->sock != NULL) ? db->sock : "<null>", strerror(errno));
+ (db->sock != NULL) ? db->sock : "<null>",
+ sstrerror(errno, errbuf, sizeof (errbuf)));
close (fd);
return (-1);
}
close (fd);
return (-1);
}