projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: declare loop variable in loop expression
[collectd.git]
/
src
/
libcollectdclient
/
client.c
diff --git
a/src/libcollectdclient/client.c
b/src/libcollectdclient/client.c
index
77fd576
..
1c118e3
100644
(file)
--- a/
src/libcollectdclient/client.c
+++ b/
src/libcollectdclient/client.c
@@
-235,12
+235,10
@@
static void lcc_chomp (char *str) /* {{{ */
static void lcc_response_free (lcc_response_t *res) /* {{{ */
{
static void lcc_response_free (lcc_response_t *res) /* {{{ */
{
- size_t i;
-
if (res == NULL)
return;
if (res == NULL)
return;
- for (i = 0; i < res->lines_num; i++)
+ for (
size_t
i = 0; i < res->lines_num; i++)
free (res->lines[i]);
free (res->lines);
res->lines = NULL;
free (res->lines[i]);
free (res->lines);
res->lines = NULL;
@@
-266,13
+264,11
@@
static int lcc_send (lcc_connection_t *c, const char *command) /* {{{ */
static int lcc_receive (lcc_connection_t *c, /* {{{ */
lcc_response_t *ret_res)
{
static int lcc_receive (lcc_connection_t *c, /* {{{ */
lcc_response_t *ret_res)
{
- lcc_response_t res;
+ lcc_response_t res
= { 0 }
;
char *ptr;
char buffer[4096];
size_t i;
char *ptr;
char buffer[4096];
size_t i;
- memset (&res, 0, sizeof (res));
-
/* Read the first line, containing the status and a message */
ptr = fgets (buffer, sizeof (buffer), c->fh);
if (ptr == NULL)
/* Read the first line, containing the status and a message */
ptr = fgets (buffer, sizeof (buffer), c->fh);
if (ptr == NULL)
@@
-358,7
+354,7
@@
static int lcc_receive (lcc_connection_t *c, /* {{{ */
static int lcc_sendreceive (lcc_connection_t *c, /* {{{ */
const char *command, lcc_response_t *ret_res)
{
static int lcc_sendreceive (lcc_connection_t *c, /* {{{ */
const char *command, lcc_response_t *ret_res)
{
- lcc_response_t res;
+ lcc_response_t res
= { 0 }
;
int status;
if (c->fh == NULL)
int status;
if (c->fh == NULL)
@@
-371,7
+367,6
@@
static int lcc_sendreceive (lcc_connection_t *c, /* {{{ */
if (status != 0)
return (status);
if (status != 0)
return (status);
- memset (&res, 0, sizeof (res));
status = lcc_receive (c, &res);
if (status == 0)
memcpy (ret_res, &res, sizeof (*ret_res));
status = lcc_receive (c, &res);
if (status == 0)
memcpy (ret_res, &res, sizeof (*ret_res));
@@
-381,7
+376,7
@@
static int lcc_sendreceive (lcc_connection_t *c, /* {{{ */
static int lcc_open_unixsocket (lcc_connection_t *c, const char *path) /* {{{ */
{
static int lcc_open_unixsocket (lcc_connection_t *c, const char *path) /* {{{ */
{
- struct sockaddr_un sa;
+ struct sockaddr_un sa
= { 0 }
;
int fd;
int status;
int fd;
int status;
@@
-398,7
+393,6
@@
static int lcc_open_unixsocket (lcc_connection_t *c, const char *path) /* {{{ */
return (-1);
}
return (-1);
}
- memset (&sa, 0, sizeof (sa));
sa.sun_family = AF_UNIX;
strncpy (sa.sun_path, path, sizeof (sa.sun_path) - 1);
sa.sun_family = AF_UNIX;
strncpy (sa.sun_path, path, sizeof (sa.sun_path) - 1);
@@
-424,9
+418,7
@@
static int lcc_open_unixsocket (lcc_connection_t *c, const char *path) /* {{{ */
static int lcc_open_netsocket (lcc_connection_t *c, /* {{{ */
const char *addr_orig)
{
static int lcc_open_netsocket (lcc_connection_t *c, /* {{{ */
const char *addr_orig)
{
- struct addrinfo ai_hints;
struct addrinfo *ai_res;
struct addrinfo *ai_res;
- struct addrinfo *ai_ptr;
char addr_copy[NI_MAXHOST];
char *addr;
char *port;
char addr_copy[NI_MAXHOST];
char *addr;
char *port;
@@
-441,14
+433,6
@@
static int lcc_open_netsocket (lcc_connection_t *c, /* {{{ */
addr_copy[sizeof(addr_copy) - 1] = '\0';
addr = addr_copy;
addr_copy[sizeof(addr_copy) - 1] = '\0';
addr = addr_copy;
- memset (&ai_hints, 0, sizeof (ai_hints));
- ai_hints.ai_flags = 0;
-#ifdef AI_ADDRCONFIG
- ai_hints.ai_flags |= AI_ADDRCONFIG;
-#endif
- ai_hints.ai_family = AF_UNSPEC;
- ai_hints.ai_socktype = SOCK_STREAM;
-
port = NULL;
if (*addr == '[') /* IPv6+port format */
{
port = NULL;
if (*addr == '[') /* IPv6+port format */
{
@@
-484,7
+468,12
@@
static int lcc_open_netsocket (lcc_connection_t *c, /* {{{ */
}
}
}
}
- ai_res = NULL;
+ struct addrinfo ai_hints = {
+ .ai_family = AF_UNSPEC,
+ .ai_flags = AI_ADDRCONFIG,
+ .ai_socktype = SOCK_STREAM
+ };
+
status = getaddrinfo (addr,
port == NULL ? LCC_DEFAULT_PORT : port,
&ai_hints, &ai_res);
status = getaddrinfo (addr,
port == NULL ? LCC_DEFAULT_PORT : port,
&ai_hints, &ai_res);
@@
-494,7
+483,7
@@
static int lcc_open_netsocket (lcc_connection_t *c, /* {{{ */
return (-1);
}
return (-1);
}
- for (ai_ptr = ai_res; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (
struct addrinfo *
ai_ptr = ai_res; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol);
if (fd < 0)
{
fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol);
if (fd < 0)
@@
-749,7
+738,6
@@
int lcc_putval (lcc_connection_t *c, const lcc_value_list_t *vl) /* {{{ */
char command[1024] = "";
lcc_response_t res;
int status;
char command[1024] = "";
lcc_response_t res;
int status;
- size_t i;
if ((c == NULL) || (vl == NULL) || (vl->values_len < 1)
|| (vl->values == NULL) || (vl->values_types == NULL))
if ((c == NULL) || (vl == NULL) || (vl->values_len < 1)
|| (vl->values == NULL) || (vl->values_types == NULL))
@@
-774,7
+762,7
@@
int lcc_putval (lcc_connection_t *c, const lcc_value_list_t *vl) /* {{{ */
else
SSTRCAT (command, " N");
else
SSTRCAT (command, " N");
- for (i = 0; i < vl->values_len; i++)
+ for (
size_t
i = 0; i < vl->values_len; i++)
{
if (vl->values_types[i] == LCC_TYPE_COUNTER)
SSTRCATF (command, ":%"PRIu64, vl->values[i].counter);
{
if (vl->values_types[i] == LCC_TYPE_COUNTER)
SSTRCATF (command, ":%"PRIu64, vl->values[i].counter);
@@
-866,7
+854,6
@@
int lcc_listval (lcc_connection_t *c, /* {{{ */
lcc_identifier_t **ret_ident, size_t *ret_ident_num)
{
lcc_response_t res;
lcc_identifier_t **ret_ident, size_t *ret_ident_num)
{
lcc_response_t res;
- size_t i;
int status;
lcc_identifier_t *ident;
int status;
lcc_identifier_t *ident;
@@
-901,7
+888,7
@@
int lcc_listval (lcc_connection_t *c, /* {{{ */
return (-1);
}
return (-1);
}
- for (i = 0; i < res.lines_num; i++)
+ for (
size_t
i = 0; i < res.lines_num; i++)
{
char *time_str;
char *ident_str;
{
char *time_str;
char *ident_str;