1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
|
Description: Cast Curl Options to long int
Author: Sven Hoexter <hoexter@debian.org>
Bug-Debian: https://bugs.debian.org/1107411
Forwarded: no
Index: powerman/src/httppower/httppower.c
===================================================================
--- powerman.orig/src/httppower/httppower.c
+++ powerman/src/httppower/httppower.c
@@ -88,7 +88,7 @@ void post(CURL *h, char **av)
}
if (postdata && url_ptr) {
- curl_easy_setopt(h, CURLOPT_POST, 1);
+ curl_easy_setopt(h, CURLOPT_POST, 1L);
curl_easy_setopt(h, CURLOPT_URL, url_ptr);
curl_easy_setopt(h, CURLOPT_POSTFIELDS, postdata);
curl_easy_setopt(h, CURLOPT_POSTFIELDSIZE, strlen (postdata));
@@ -96,7 +96,7 @@ void post(CURL *h, char **av)
printf("Error: %s\n", errbuf);
curl_easy_setopt(h, CURLOPT_URL, "");
curl_easy_setopt(h, CURLOPT_POSTFIELDS, "");
- curl_easy_setopt(h, CURLOPT_POSTFIELDSIZE, 0);
+ curl_easy_setopt(h, CURLOPT_POSTFIELDSIZE, 0L);
} else
printf("Nothing to post!\n");
@@ -137,7 +137,7 @@ void put(CURL *h, char **av)
}
if (putdata && url_ptr) {
- curl_easy_setopt(h, CURLOPT_UPLOAD, 1);
+ curl_easy_setopt(h, CURLOPT_UPLOAD, 1L);
curl_easy_setopt(h, CURLOPT_URL, url_ptr);
curl_easy_setopt(h, CURLOPT_READFUNCTION, put_read_cb);
pcd.data = putdata;
@@ -147,7 +147,7 @@ void put(CURL *h, char **av)
if (curl_easy_perform(h) != 0)
printf("Error: %s\n", errbuf);
curl_easy_setopt(h, CURLOPT_URL, "");
- curl_easy_setopt(h, CURLOPT_UPLOAD, 0);
+ curl_easy_setopt(h, CURLOPT_UPLOAD, 0L);
} else
printf("Nothing to put!\n");
@@ -162,7 +162,7 @@ void get(CURL *h, char **av)
char *myurl = _make_url(av[0]);
if (myurl) {
- curl_easy_setopt(h, CURLOPT_HTTPGET, 1);
+ curl_easy_setopt(h, CURLOPT_HTTPGET, 1L);
curl_easy_setopt(h, CURLOPT_URL, myurl);
if (curl_easy_perform(h) != 0)
printf("Error: %s\n", errbuf);
@@ -324,9 +324,9 @@ main(int argc, char *argv[])
if ((h = curl_easy_init()) == NULL)
err_exit(false, "curl_easy_init failed");
- curl_easy_setopt(h, CURLOPT_TIMEOUT, 5);
+ curl_easy_setopt(h, CURLOPT_TIMEOUT, 5L);
curl_easy_setopt(h, CURLOPT_ERRORBUFFER, errbuf);
- curl_easy_setopt(h, CURLOPT_FAILONERROR, 1);
+ curl_easy_setopt(h, CURLOPT_FAILONERROR, 1L);
/* for time being */
curl_easy_setopt(h, CURLOPT_SSL_VERIFYPEER, 0L);
Index: powerman/src/redfishpower/redfishpower.c
===================================================================
--- powerman.orig/src/redfishpower/redfishpower.c
+++ powerman/src/redfishpower/redfishpower.c
@@ -288,7 +288,7 @@ static void powermsg_init_curl(struct po
/* Per documentation, CURLOPT_TIMEOUT overrides
* CURLOPT_CONNECTTIMEOUT */
Curl_easy_setopt((pm->eh, CURLOPT_TIMEOUT, message_timeout));
- Curl_easy_setopt((pm->eh, CURLOPT_FAILONERROR, 1));
+ Curl_easy_setopt((pm->eh, CURLOPT_FAILONERROR, 1L));
/* for time being */
Curl_easy_setopt((pm->eh, CURLOPT_SSL_VERIFYPEER, 0L));
@@ -321,12 +321,12 @@ static void powermsg_init_curl(struct po
Curl_easy_setopt((pm->eh, CURLOPT_URL, pm->url));
if (pm->postdata) {
- Curl_easy_setopt((pm->eh, CURLOPT_POST, 1));
+ Curl_easy_setopt((pm->eh, CURLOPT_POST, 1L));
Curl_easy_setopt((pm->eh, CURLOPT_POSTFIELDS, pm->postdata));
Curl_easy_setopt((pm->eh, CURLOPT_POSTFIELDSIZE, strlen(pm->postdata)));
}
else
- Curl_easy_setopt((pm->eh, CURLOPT_HTTPGET, 1));
+ Curl_easy_setopt((pm->eh, CURLOPT_HTTPGET, 1L));
}
static char *resolve_hosts_url(const char *hostname, const char *path)
@@ -1221,7 +1221,7 @@ static void power_cleanup(struct powerms
{
if (!test_mode && pm->eh) {
Curl_easy_setopt((pm->eh, CURLOPT_POSTFIELDS, ""));
- Curl_easy_setopt((pm->eh, CURLOPT_POSTFIELDSIZE, 0));
+ Curl_easy_setopt((pm->eh, CURLOPT_POSTFIELDSIZE, 0L));
}
powermsg_destroy(pm);
}
|