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'
[collectd.git]
/
src
/
ascent.c
diff --git
a/src/ascent.c
b/src/ascent.c
index
501f294
..
9124c26
100644
(file)
--- a/
src/ascent.c
+++ b/
src/ascent.c
@@
-32,7
+32,7
@@
#include <curl/curl.h>
#include <libxml/parser.h>
#include <curl/curl.h>
#include <libxml/parser.h>
-static char *races_list[] = /* {{{ */
+static c
onst c
har *races_list[] = /* {{{ */
{
NULL,
"Human", /* 1 */
{
NULL,
"Human", /* 1 */
@@
-49,7
+49,7
@@
static char *races_list[] = /* {{{ */
}; /* }}} */
#define RACES_LIST_LENGTH STATIC_ARRAY_SIZE (races_list)
}; /* }}} */
#define RACES_LIST_LENGTH STATIC_ARRAY_SIZE (races_list)
-static char *classes_list[] = /* {{{ */
+static c
onst c
har *classes_list[] = /* {{{ */
{
NULL,
"Warrior", /* 1 */
{
NULL,
"Warrior", /* 1 */
@@
-66,7
+66,7
@@
static char *classes_list[] = /* {{{ */
}; /* }}} */
#define CLASSES_LIST_LENGTH STATIC_ARRAY_SIZE (classes_list)
}; /* }}} */
#define CLASSES_LIST_LENGTH STATIC_ARRAY_SIZE (classes_list)
-static char *genders_list[] = /* {{{ */
+static c
onst c
har *genders_list[] = /* {{{ */
{
"Male",
"Female"
{
"Male",
"Female"
@@
-154,14
+154,14
@@
static size_t ascent_curl_callback (void *buf, size_t size, size_t nmemb, /* {{{
{
size_t len = size * nmemb;
{
size_t len = size * nmemb;
- if (len
<
= 0)
+ if (len
=
= 0)
return (len);
if ((ascent_buffer_fill + len) >= ascent_buffer_size)
{
char *temp;
return (len);
if ((ascent_buffer_fill + len) >= ascent_buffer_size)
{
char *temp;
- temp =
(char *)
realloc (ascent_buffer,
+ temp = realloc (ascent_buffer,
ascent_buffer_fill + len + 1);
if (temp == NULL)
{
ascent_buffer_fill + len + 1);
if (temp == NULL)
{
@@
-590,11
+590,12
@@
static int ascent_init (void) /* {{{ */
if (cacert != NULL)
curl_easy_setopt (curl, CURLOPT_CAINFO, cacert);
if (cacert != NULL)
curl_easy_setopt (curl, CURLOPT_CAINFO, cacert);
+#ifdef HAVE_CURLOPT_TIMEOUT_MS
if (timeout != NULL)
curl_easy_setopt (curl, CURLOPT_TIMEOUT_MS, atol(timeout));
else
if (timeout != NULL)
curl_easy_setopt (curl, CURLOPT_TIMEOUT_MS, atol(timeout));
else
- curl_easy_setopt (curl, CURLOPT_TIMEOUT_MS,
- CDTIME_T_TO_MS(plugin_get_interval()));
+ curl_easy_setopt (curl, CURLOPT_TIMEOUT_MS,
(long) CDTIME_T_TO_MS(plugin_get_interval()));
+#endif
return (0);
} /* }}} int ascent_init */
return (0);
} /* }}} int ascent_init */