From 363c182af2404710a5946ea3d9bb93f29f7927c0 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Sat, 2 Feb 2013 01:19:48 +0100 Subject: [PATCH] curl's numeric options are always at minimum long, never int This can affect portability to some architectures. Signed-off-by: Florian Forster --- src/apache.c | 12 ++++++------ src/ascent.c | 12 ++++++------ src/bind.c | 4 ++-- src/curl.c | 8 ++++---- src/curl_json.c | 6 +++--- src/curl_xml.c | 2 +- src/nginx.c | 12 ++++++------ src/write_http.c | 6 +++--- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/apache.c b/src/apache.c index 5f5441ff..33ee1305 100644 --- a/src/apache.c +++ b/src/apache.c @@ -406,7 +406,7 @@ static int init_host (apache_t *st) /* {{{ */ return (-1); } - curl_easy_setopt (st->curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt (st->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (st->curl, CURLOPT_WRITEFUNCTION, apache_curl_callback); curl_easy_setopt (st->curl, CURLOPT_WRITEDATA, st); @@ -456,24 +456,24 @@ static int init_host (apache_t *st) /* {{{ */ } curl_easy_setopt (st->curl, CURLOPT_URL, st->url); - curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1L); if (st->verify_peer != 0) { - curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 1); + curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 1L); } else { - curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYPEER, 0L); } if (st->verify_host != 0) { - curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYHOST, 2); + curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYHOST, 2L); } else { - curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYHOST, 0); + curl_easy_setopt (st->curl, CURLOPT_SSL_VERIFYHOST, 0L); } if (st->cacert != NULL) diff --git a/src/ascent.c b/src/ascent.c index 993e480c..3a7c3939 100644 --- a/src/ascent.c +++ b/src/ascent.c @@ -539,7 +539,7 @@ static int ascent_init (void) /* {{{ */ return (-1); } - curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ascent_curl_callback); curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, ascent_curl_error); @@ -561,17 +561,17 @@ static int ascent_init (void) /* {{{ */ } curl_easy_setopt (curl, CURLOPT_URL, url); - curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L); if ((verify_peer == NULL) || IS_TRUE (verify_peer)) - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1L); else - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0L); if ((verify_host == NULL) || IS_TRUE (verify_host)) - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2L); else - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0L); if (cacert != NULL) curl_easy_setopt (curl, CURLOPT_CAINFO, cacert); diff --git a/src/bind.c b/src/bind.c index 28c1e56a..c00f5ae9 100644 --- a/src/bind.c +++ b/src/bind.c @@ -1383,12 +1383,12 @@ static int bind_init (void) /* {{{ */ return (-1); } - curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, bind_curl_callback); curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, bind_curl_error); curl_easy_setopt (curl, CURLOPT_URL, (url != NULL) ? url : BIND_DEFAULT_URL); - curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L); return (0); } /* }}} int bind_init */ diff --git a/src/curl.c b/src/curl.c index 31cda39a..214fb519 100644 --- a/src/curl.c +++ b/src/curl.c @@ -370,14 +370,14 @@ static int cc_page_init_curl (web_page_t *wp) /* {{{ */ return (-1); } - curl_easy_setopt (wp->curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt (wp->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (wp->curl, CURLOPT_WRITEFUNCTION, cc_curl_callback); curl_easy_setopt (wp->curl, CURLOPT_WRITEDATA, wp); curl_easy_setopt (wp->curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); curl_easy_setopt (wp->curl, CURLOPT_ERRORBUFFER, wp->curl_errbuf); curl_easy_setopt (wp->curl, CURLOPT_URL, wp->url); - curl_easy_setopt (wp->curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt (wp->curl, CURLOPT_FOLLOWLOCATION, 1L); if (wp->user != NULL) { @@ -399,9 +399,9 @@ static int cc_page_init_curl (web_page_t *wp) /* {{{ */ curl_easy_setopt (wp->curl, CURLOPT_USERPWD, wp->credentials); } - curl_easy_setopt (wp->curl, CURLOPT_SSL_VERIFYPEER, wp->verify_peer); + curl_easy_setopt (wp->curl, CURLOPT_SSL_VERIFYPEER, (long) wp->verify_peer); curl_easy_setopt (wp->curl, CURLOPT_SSL_VERIFYHOST, - wp->verify_host ? 2 : 0); + wp->verify_host ? 2L : 0L); if (wp->cacert != NULL) curl_easy_setopt (wp->curl, CURLOPT_CAINFO, wp->cacert); diff --git a/src/curl_json.c b/src/curl_json.c index 968fc93c..51c1b2ed 100644 --- a/src/curl_json.c +++ b/src/curl_json.c @@ -579,7 +579,7 @@ static int cj_init_curl (cj_t *db) /* {{{ */ return (-1); } - curl_easy_setopt (db->curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt (db->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (db->curl, CURLOPT_WRITEFUNCTION, cj_curl_callback); curl_easy_setopt (db->curl, CURLOPT_WRITEDATA, db); curl_easy_setopt (db->curl, CURLOPT_USERAGENT, @@ -607,9 +607,9 @@ static int cj_init_curl (cj_t *db) /* {{{ */ curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials); } - curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, db->verify_peer); + curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer); curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYHOST, - db->verify_host ? 2 : 0); + db->verify_host ? 2L : 0L); if (db->cacert != NULL) curl_easy_setopt (db->curl, CURLOPT_CAINFO, db->cacert); diff --git a/src/curl_xml.c b/src/curl_xml.c index 46e0d490..da90d7c8 100644 --- a/src/curl_xml.c +++ b/src/curl_xml.c @@ -737,7 +737,7 @@ static int cx_init_curl (cx_t *db) /* {{{ */ return (-1); } - curl_easy_setopt (db->curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt (db->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (db->curl, CURLOPT_WRITEFUNCTION, cx_curl_callback); curl_easy_setopt (db->curl, CURLOPT_WRITEDATA, db); curl_easy_setopt (db->curl, CURLOPT_USERAGENT, diff --git a/src/nginx.c b/src/nginx.c index d9529516..f1f3f99c 100644 --- a/src/nginx.c +++ b/src/nginx.c @@ -119,7 +119,7 @@ static int init (void) return (-1); } - curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, nginx_curl_callback); curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, nginx_curl_error); @@ -142,24 +142,24 @@ static int init (void) curl_easy_setopt (curl, CURLOPT_URL, url); } - curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L); if ((verify_peer == NULL) || IS_TRUE (verify_peer)) { - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1L); } else { - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0L); } if ((verify_host == NULL) || IS_TRUE (verify_host)) { - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2L); } else { - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0L); } if (cacert != NULL) diff --git a/src/write_http.c b/src/write_http.c index 22b5842a..e08594cd 100644 --- a/src/write_http.c +++ b/src/write_http.c @@ -111,7 +111,7 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ return (-1); } - curl_easy_setopt (cb->curl, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt (cb->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (cb->curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); headers = NULL; @@ -147,9 +147,9 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ curl_easy_setopt (cb->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); } - curl_easy_setopt (cb->curl, CURLOPT_SSL_VERIFYPEER, cb->verify_peer); + curl_easy_setopt (cb->curl, CURLOPT_SSL_VERIFYPEER, (long) cb->verify_peer); curl_easy_setopt (cb->curl, CURLOPT_SSL_VERIFYHOST, - cb->verify_host ? 2 : 0); + cb->verify_host ? 2L : 0L); if (cb->cacert != NULL) curl_easy_setopt (cb->curl, CURLOPT_CAINFO, cb->cacert); -- 2.11.0