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-4.7'
[collectd.git]
/
src
/
utils_match.c
diff --git
a/src/utils_match.c
b/src/utils_match.c
index
9e75e4e
..
c19c5ff
100644
(file)
--- a/
src/utils_match.c
+++ b/
src/utils_match.c
@@
-50,7
+50,7
@@
static char *match_substr (const char *str, int begin, int end)
if ((begin < 0) || (end < 0) || (begin >= end))
return (NULL);
if ((begin < 0) || (end < 0) || (begin >= end))
return (NULL);
- if (end > (strlen (str) + 1))
+ if (
(size_t)
end > (strlen (str) + 1))
{
ERROR ("utils_match: match_substr: `end' points after end of string.");
return (NULL);
{
ERROR ("utils_match: match_substr: `end' points after end of string.");
return (NULL);
@@
-68,7
+68,7
@@
static char *match_substr (const char *str, int begin, int end)
return (ret);
} /* char *match_substr */
return (ret);
} /* char *match_substr */
-static int default_callback (const char *str,
+static int default_callback (const char
__attribute__((unused))
*str,
char * const *matches, size_t matches_num, void *user_data)
{
cu_match_value_t *data = (cu_match_value_t *) user_data;
char * const *matches, size_t matches_num, void *user_data)
{
cu_match_value_t *data = (cu_match_value_t *) user_data;
@@
-228,7
+228,7
@@
int match_apply (cu_match_t *obj, const char *str)
regmatch_t re_match[32];
char *matches[32];
size_t matches_num;
regmatch_t re_match[32];
char *matches[32];
size_t matches_num;
-
in
t i;
+
size_
t i;
if ((obj == NULL) || (str == NULL))
return (-1);
if ((obj == NULL) || (str == NULL))
return (-1);