aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2011-05-21 14:10:17 +0200
committerYang Tse <yangsita@gmail.com>2011-05-21 14:10:17 +0200
commitfce7276f5446e7fc1003b98a9a752a3a42a0a247 (patch)
treefbe4ca6bcf1657087db101605247205e226dc392 /lib
parent004d84fcc17e3cb46a5cfed694ddcd122bd2f4ba (diff)
compiler warning: fix
Fix compiler warning: enumerated type mixed with another type
Diffstat (limited to 'lib')
-rw-r--r--lib/asyn-ares.c2
-rw-r--r--lib/asyn-thread.c2
-rw-r--r--lib/asyn.h2
-rw-r--r--lib/url.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 5710400bc..6027cc7ba 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -140,7 +140,7 @@ void Curl_resolver_global_cleanup(void)
* URL-state specific environment ('resolver' member of the UrlState
* structure). Fills the passed pointer by the initialized ares_channel.
*/
-int Curl_resolver_init(void **resolver)
+CURLcode Curl_resolver_init(void **resolver)
{
int status = ares_init((ares_channel*)resolver);
if(status != ARES_SUCCESS) {
diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index e073d3a58..cc444da4c 100644
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -119,7 +119,7 @@ void Curl_resolver_global_cleanup(void)
* URL-state specific environment ('resolver' member of the UrlState
* structure). Does nothing here.
*/
-int Curl_resolver_init(void **resolver)
+CURLcode Curl_resolver_init(void **resolver)
{
(void)resolver;
return CURLE_OK;
diff --git a/lib/asyn.h b/lib/asyn.h
index 4e16de03d..34f9c14c5 100644
--- a/lib/asyn.h
+++ b/lib/asyn.h
@@ -60,7 +60,7 @@ void Curl_resolver_global_cleanup(void);
* Returning anything else than CURLE_OK fails curl_easy_init() with the
* correspondent code.
*/
-int Curl_resolver_init(void **resolver);
+CURLcode Curl_resolver_init(void **resolver);
/*
* Curl_resolver_cleanup()
diff --git a/lib/url.c b/lib/url.c
index b0b2d8f13..ac3399b9e 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -765,7 +765,7 @@ CURLcode Curl_open(struct SessionHandle **curl)
{
CURLcode res = CURLE_OK;
struct SessionHandle *data;
- int status;
+ CURLcode status;
/* Very simple start-up: alloc the struct, init it with zeroes and return */
data = calloc(1, sizeof(struct SessionHandle));