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.5' into collectd-4.6
[collectd.git]
/
src
/
apache.c
diff --git
a/src/apache.c
b/src/apache.c
index
7dc34f5
..
4fa7aa1
100644
(file)
--- a/
src/apache.c
+++ b/
src/apache.c
@@
-55,7
+55,7
@@
static const char *config_keys[] =
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
- void *stream)
+ void
__attribute__((unused))
*stream)
{
size_t len = size * nmemb;
{
size_t len = size * nmemb;
@@
-148,7
+148,7
@@
static int init (void)
status = ssnprintf (credentials, sizeof (credentials), "%s:%s",
user, (pass == NULL) ? "" : pass);
status = ssnprintf (credentials, sizeof (credentials), "%s:%s",
user, (pass == NULL) ? "" : pass);
- if (
status >= sizeof (credentials
))
+ if (
(status < 0) || ((size_t) status >= sizeof (credentials)
))
{
ERROR ("apache plugin: init: Returning an error "
"because the credentials have been "
{
ERROR ("apache plugin: init: Returning an error "
"because the credentials have been "