summaryrefslogtreecommitdiff
path: root/lib/escape.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-10-28 22:42:42 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-10-28 22:45:32 +0000
commit085081fc6e7da0b43c2bc1930c643dd7efb7f2cc (patch)
tree54cb71294c863add2b8c19f77ed1108b8905087d /lib/escape.c
parentb790bdf46b7b3c9f5269163b25505f7b9ae1e319 (diff)
downloadgnurl-085081fc6e7da0b43c2bc1930c643dd7efb7f2cc.tar.gz
gnurl-085081fc6e7da0b43c2bc1930c643dd7efb7f2cc.tar.bz2
gnurl-085081fc6e7da0b43c2bc1930c643dd7efb7f2cc.zip
code cleanup: We prefer 'CURLcode result'
Diffstat (limited to 'lib/escape.c')
-rw-r--r--lib/escape.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/escape.c b/lib/escape.c
index d7f8a8f54..9923e64cf 100644
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -87,7 +87,7 @@ char *curl_easy_escape(CURL *handle, const char *string, int inlength)
size_t newlen = alloc;
size_t strindex=0;
size_t length;
- CURLcode res;
+ CURLcode result;
ns = malloc(alloc);
if(!ns)
@@ -115,8 +115,8 @@ char *curl_easy_escape(CURL *handle, const char *string, int inlength)
}
}
- res = Curl_convert_to_network(handle, &in, 1);
- if(res) {
+ result = Curl_convert_to_network(handle, &in, 1);
+ if(result) {
/* Curl_convert_to_network calls failf if unsuccessful */
free(ns);
return NULL;
@@ -152,7 +152,7 @@ CURLcode Curl_urldecode(struct SessionHandle *data,
unsigned char in;
size_t strindex=0;
unsigned long hex;
- CURLcode res;
+ CURLcode result;
if(!ns)
return CURLE_OUT_OF_MEMORY;
@@ -172,16 +172,17 @@ CURLcode Curl_urldecode(struct SessionHandle *data,
in = curlx_ultouc(hex); /* this long is never bigger than 255 anyway */
- res = Curl_convert_from_network(data, &in, 1);
- if(res) {
+ result = Curl_convert_from_network(data, &in, 1);
+ if(result) {
/* Curl_convert_from_network calls failf if unsuccessful */
free(ns);
- return res;
+ return result;
}
string+=2;
alloc-=2;
}
+
if(reject_ctrl && (in < 0x20)) {
free(ns);
return CURLE_URL_MALFORMAT;