aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2010-06-01 12:25:14 +0200
committerYang Tse <yangsita@gmail.com>2010-06-01 12:25:14 +0200
commitb38189c7b41cc2a327ab690a523441bcb3e6f9fe (patch)
tree49d71e2c1320e17d78579ab6a4c730e1a4c9ebee
parent1bb04927f3f880a3e275db32bb047eb98c925d3f (diff)
fix compiler warning: enumerated type mixed with another type
-rw-r--r--lib/url.c2
-rw-r--r--src/main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/url.c b/lib/url.c
index 6c48dcb2e..3f55f7bda 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2463,7 +2463,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
break;
case CURLOPT_WILDCARDMATCH:
- data->set.wildcardmatch = !! va_arg(param, long);
+ data->set.wildcardmatch = (bool)(0 != va_arg(param, long));
break;
case CURLOPT_CHUNK_BGN_FUNCTION:
data->set.chunk_bgn = va_arg(param, curl_chunk_bgn_callback);
diff --git a/src/main.c b/src/main.c
index 4e0128cb7..5827b5ed4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2406,12 +2406,12 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
config->ftp_pret = toggle;
break;
case 'D': /* --proto */
- config->proto_present = 1;
+ config->proto_present = TRUE;
if(proto2num(config, &config->proto, nextarg))
return PARAM_BAD_USE;
break;
case 'E': /* --proto-redir */
- config->proto_redir_present = 1;
+ config->proto_redir_present = TRUE;
if(proto2num(config, &config->proto_redir, nextarg))
return PARAM_BAD_USE;
break;