projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1844 from rubenk/sigrok
[collectd.git]
/
src
/
daemon
/
common.c
diff --git
a/src/daemon/common.c
b/src/daemon/common.c
index
9da4775
..
b60530a
100644
(file)
--- a/
src/daemon/common.c
+++ b/
src/daemon/common.c
@@
-32,6
+32,7
@@
#endif
#include "collectd.h"
#endif
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "utils_cache.h"
#include "common.h"
#include "plugin.h"
#include "utils_cache.h"
@@
-332,7
+333,6
@@
int strjoin (char *buffer, size_t buffer_size,
size_t avail;
char *ptr;
size_t sep_len;
size_t avail;
char *ptr;
size_t sep_len;
- size_t i;
if ((buffer_size < 1) || (fields_num == 0))
return (-1);
if ((buffer_size < 1) || (fields_num == 0))
return (-1);
@@
-345,7
+345,7
@@
int strjoin (char *buffer, size_t buffer_size,
if (sep != NULL)
sep_len = strlen (sep);
if (sep != NULL)
sep_len = strlen (sep);
- for (i = 0; i < fields_num; i++)
+ for (
size_t
i = 0; i < fields_num; i++)
{
size_t field_len;
{
size_t field_len;
@@
-375,7
+375,6
@@
int strjoin (char *buffer, size_t buffer_size,
int escape_string (char *buffer, size_t buffer_size)
{
char *temp;
int escape_string (char *buffer, size_t buffer_size)
{
char *temp;
- size_t i;
size_t j;
/* Check if we need to escape at all first */
size_t j;
/* Check if we need to escape at all first */
@@
-393,7
+392,7
@@
int escape_string (char *buffer, size_t buffer_size)
temp[0] = '"';
j = 1;
temp[0] = '"';
j = 1;
- for (i = 0; i < buffer_size; i++)
+ for (
size_t
i = 0; i < buffer_size; i++)
{
if (buffer[i] == 0)
{
{
if (buffer[i] == 0)
{
@@
-427,9
+426,7
@@
int escape_string (char *buffer, size_t buffer_size)
int strunescape (char *buf, size_t buf_len)
{
int strunescape (char *buf, size_t buf_len)
{
- size_t i;
-
- for (i = 0; (i < buf_len) && (buf[i] != '\0'); ++i)
+ for (size_t i = 0; (i < buf_len) && (buf[i] != '\0'); ++i)
{
if (buf[i] != '\\')
continue;
{
if (buf[i] != '\\')
continue;
@@
-483,7
+480,6
@@
size_t strstripnewline (char *buffer)
int escape_slashes (char *buffer, size_t buffer_size)
{
size_t buffer_len;
int escape_slashes (char *buffer, size_t buffer_size)
{
size_t buffer_len;
- size_t i;
buffer_len = strlen (buffer);
buffer_len = strlen (buffer);
@@
-505,7
+501,7
@@
int escape_slashes (char *buffer, size_t buffer_size)
buffer_len--;
}
buffer_len--;
}
- for (i = 0; i < buffer_len; i++)
+ for (
size_t
i = 0; i < buffer_len; i++)
{
if (buffer[i] == '/')
buffer[i] = '_';
{
if (buffer[i] == '/')
buffer[i] = '_';
@@
-516,9
+512,7
@@
int escape_slashes (char *buffer, size_t buffer_size)
void replace_special (char *buffer, size_t buffer_size)
{
void replace_special (char *buffer, size_t buffer_size)
{
- size_t i;
-
- for (i = 0; i < buffer_size; i++)
+ for (size_t i = 0; i < buffer_size; i++)
{
if (buffer[i] == 0)
return;
{
if (buffer[i] == 0)
return;
@@
-592,7
+586,6
@@
int check_create_dir (const char *file_orig)
int last_is_file = 1;
int path_is_absolute = 0;
size_t len;
int last_is_file = 1;
int path_is_absolute = 0;
size_t len;
- int i;
/*
* Sanity checks first
/*
* Sanity checks first
@@
-638,7
+631,7
@@
int check_create_dir (const char *file_orig)
/*
* For each component, do..
*/
/*
* For each component, do..
*/
- for (i = 0; i < (fields_num - last_is_file); i++)
+ for (i
nt i
= 0; i < (fields_num - last_is_file); i++)
{
/*
* Do not create directories that start with a dot. This
{
/*
* Do not create directories that start with a dot. This
@@
-937,7
+930,6
@@
int format_values (char *ret, size_t ret_len, /* {{{ */
{
size_t offset = 0;
int status;
{
size_t offset = 0;
int status;
- size_t i;
gauge_t *rates = NULL;
assert (0 == strcmp (ds->type, vl->type));
gauge_t *rates = NULL;
assert (0 == strcmp (ds->type, vl->type));
@@
-963,7
+955,7
@@
int format_values (char *ret, size_t ret_len, /* {{{ */
BUFFER_ADD ("%.3f", CDTIME_T_TO_DOUBLE (vl->time));
BUFFER_ADD ("%.3f", CDTIME_T_TO_DOUBLE (vl->time));
- for (i = 0; i < ds->ds_num; i++)
+ for (
size_t
i = 0; i < ds->ds_num; i++)
{
if (ds->ds[i].type == DS_TYPE_GAUGE)
BUFFER_ADD (":"GAUGE_FORMAT, vl->values[i].gauge);
{
if (ds->ds[i].type == DS_TYPE_GAUGE)
BUFFER_ADD (":"GAUGE_FORMAT, vl->values[i].gauge);
@@
-1517,16
+1509,15
@@
int value_to_rate (gauge_t *ret_rate, /* {{{ */
int service_name_to_port_number (const char *service_name)
{
struct addrinfo *ai_list;
int service_name_to_port_number (const char *service_name)
{
struct addrinfo *ai_list;
- struct addrinfo *ai_ptr;
- struct addrinfo ai_hints = { 0 };
int status;
int service_number;
if (service_name == NULL)
return (-1);
int status;
int service_number;
if (service_name == NULL)
return (-1);
- ai_list = NULL;
- ai_hints.ai_family = AF_UNSPEC;
+ struct addrinfo ai_hints = {
+ .ai_family = AF_UNSPEC
+ };
status = getaddrinfo (/* node = */ NULL, service_name,
&ai_hints, &ai_list);
status = getaddrinfo (/* node = */ NULL, service_name,
&ai_hints, &ai_list);
@@
-1538,7
+1529,7
@@
int service_name_to_port_number (const char *service_name)
}
service_number = -1;
}
service_number = -1;
- for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+ for (
struct addrinfo *
ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
if (ai_ptr->ai_family == AF_INET)
{
{
if (ai_ptr->ai_family == AF_INET)
{
@@
-1629,9
+1620,7
@@
int strarray_add (char ***ret_array, size_t *ret_array_len, char const *str) /*
void strarray_free (char **array, size_t array_len) /* {{{ */
{
void strarray_free (char **array, size_t array_len) /* {{{ */
{
- size_t i;
-
- for (i = 0; i < array_len; i++)
+ for (size_t i = 0; i < array_len; i++)
sfree (array[i]);
sfree (array);
} /* }}} void strarray_free */
sfree (array[i]);
sfree (array);
} /* }}} void strarray_free */