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 #3339 from jkohen/patch-1
[collectd.git]
/
src
/
ascent.c
diff --git
a/src/ascent.c
b/src/ascent.c
index
09dd5de
..
6240e31
100644
(file)
--- a/
src/ascent.c
+++ b/
src/ascent.c
@@
-26,8
+26,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <curl/curl.h>
#include <libxml/parser.h>
#include <curl/curl.h>
#include <libxml/parser.h>
@@
-98,8
+98,8
@@
static char *timeout;
static CURL *curl;
static char *ascent_buffer;
static CURL *curl;
static char *ascent_buffer;
-static size_t ascent_buffer_size
= 0
;
-static size_t ascent_buffer_fill
= 0
;
+static size_t ascent_buffer_size;
+static size_t ascent_buffer_fill;
static char ascent_curl_error[CURL_ERROR_SIZE];
static const char *config_keys[] = {
static char ascent_curl_error[CURL_ERROR_SIZE];
static const char *config_keys[] = {
@@
-499,8
+499,8
@@
static int ascent_init(void) /* {{{ */
static char credentials[1024];
int status;
static char credentials[1024];
int status;
- status = snprintf(credentials, sizeof(credentials), "%s:%s", user,
- (pass == NULL) ? "" : pass);
+ status = s
s
nprintf(credentials, sizeof(credentials), "%s:%s", user,
+
(pass == NULL) ? "" : pass);
if ((status < 0) || ((size_t)status >= sizeof(credentials))) {
ERROR("ascent plugin: ascent_init: Returning an error because the "
"credentials have been truncated.");
if ((status < 0) || ((size_t)status >= sizeof(credentials))) {
ERROR("ascent plugin: ascent_init: Returning an error because the "
"credentials have been truncated.");