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.5' into collectd-5.6
[collectd.git]
/
src
/
daemon
/
utils_tail_match.c
diff --git
a/src/daemon/utils_tail_match.c
b/src/daemon/utils_tail_match.c
index
8776ad1
..
ffcaa90
100644
(file)
--- a/
src/daemon/utils_tail_match.c
+++ b/
src/daemon/utils_tail_match.c
@@
-30,6
+30,7
@@
*/
#include "collectd.h"
*/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "utils_match.h"
#include "common.h"
#include "plugin.h"
#include "utils_match.h"
@@
-111,9
+112,8
@@
static int tail_callback (void *data, char *buf,
int __attribute__((unused)) buflen)
{
cu_tail_match_t *obj = (cu_tail_match_t *) data;
int __attribute__((unused)) buflen)
{
cu_tail_match_t *obj = (cu_tail_match_t *) data;
- size_t i;
- for (i = 0; i < obj->matches_num; i++)
+ for (
size_t
i = 0; i < obj->matches_num; i++)
match_apply (obj->matches[i].match, buf);
return (0);
match_apply (obj->matches[i].match, buf);
return (0);
@@
-126,10
+126,9
@@
cu_tail_match_t *tail_match_create (const char *filename)
{
cu_tail_match_t *obj;
{
cu_tail_match_t *obj;
- obj =
(cu_tail_match_t *) malloc (sizeof (cu_tail_match_t
));
+ obj =
calloc (1, sizeof (*obj
));
if (obj == NULL)
return (NULL);
if (obj == NULL)
return (NULL);
- memset (obj, '\0', sizeof (cu_tail_match_t));
obj->tail = cu_tail_create (filename);
if (obj->tail == NULL)
obj->tail = cu_tail_create (filename);
if (obj->tail == NULL)
@@
-143,8
+142,6
@@
cu_tail_match_t *tail_match_create (const char *filename)
void tail_match_destroy (cu_tail_match_t *obj)
{
void tail_match_destroy (cu_tail_match_t *obj)
{
- size_t i;
-
if (obj == NULL)
return;
if (obj == NULL)
return;
@@
-154,7
+151,7
@@
void tail_match_destroy (cu_tail_match_t *obj)
obj->tail = NULL;
}
obj->tail = NULL;
}
- for (i = 0; i < obj->matches_num; i++)
+ for (
size_t
i = 0; i < obj->matches_num; i++)
{
cu_tail_match_match_t *match = obj->matches + i;
if (match->match != NULL)
{
cu_tail_match_match_t *match = obj->matches + i;
if (match->match != NULL)
@@
-180,7
+177,7
@@
int tail_match_add_match (cu_tail_match_t *obj, cu_match_t *match,
{
cu_tail_match_match_t *temp;
{
cu_tail_match_match_t *temp;
- temp =
(cu_tail_match_match_t *)
realloc (obj->matches,
+ temp = realloc (obj->matches,
sizeof (cu_tail_match_match_t) * (obj->matches_num + 1));
if (temp == NULL)
return (-1);
sizeof (cu_tail_match_match_t) * (obj->matches_num + 1));
if (temp == NULL)
return (-1);
@@
-212,13
+209,12
@@
int tail_match_add_match_simple (cu_tail_match_t *obj,
if (match == NULL)
return (-1);
if (match == NULL)
return (-1);
- user_data =
(cu_tail_match_simple_t *) malloc (sizeof (cu_tail_match_simple_t
));
+ user_data =
calloc (1, sizeof (*user_data
));
if (user_data == NULL)
{
match_destroy (match);
return (-1);
}
if (user_data == NULL)
{
match_destroy (match);
return (-1);
}
- memset (user_data, '\0', sizeof (cu_tail_match_simple_t));
sstrncpy (user_data->plugin, plugin, sizeof (user_data->plugin));
if (plugin_instance != NULL)
sstrncpy (user_data->plugin, plugin, sizeof (user_data->plugin));
if (plugin_instance != NULL)
@@
-248,7
+244,6
@@
int tail_match_read (cu_tail_match_t *obj)
{
char buffer[4096];
int status;
{
char buffer[4096];
int status;
- size_t i;
status = cu_tail_read (obj->tail, buffer, sizeof (buffer), tail_callback,
(void *) obj);
status = cu_tail_read (obj->tail, buffer, sizeof (buffer), tail_callback,
(void *) obj);
@@
-258,7
+253,7
@@
int tail_match_read (cu_tail_match_t *obj)
return (status);
}
return (status);
}
- for (i = 0; i < obj->matches_num; i++)
+ for (
size_t
i = 0; i < obj->matches_num; i++)
{
cu_tail_match_match_t *lt_match = obj->matches + i;
{
cu_tail_match_match_t *lt_match = obj->matches + i;