projects
/
platform
/
upstream
/
curl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Update to 7.40.1"
[platform/upstream/curl.git]
/
lib
/
escape.c
diff --git
a/lib/escape.c
b/lib/escape.c
index
9923e64
..
d7f8a8f
100644
(file)
--- 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;
size_t newlen = alloc;
size_t strindex=0;
size_t length;
- CURLcode res
ult
;
+ CURLcode res;
ns = malloc(alloc);
if(!ns)
ns = malloc(alloc);
if(!ns)
@@
-115,8
+115,8
@@
char *curl_easy_escape(CURL *handle, const char *string, int inlength)
}
}
}
}
- res
ult
= Curl_convert_to_network(handle, &in, 1);
- if(res
ult
) {
+ res = Curl_convert_to_network(handle, &in, 1);
+ if(res) {
/* Curl_convert_to_network calls failf if unsuccessful */
free(ns);
return NULL;
/* 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;
unsigned char in;
size_t strindex=0;
unsigned long hex;
- CURLcode res
ult
;
+ CURLcode res;
if(!ns)
return CURLE_OUT_OF_MEMORY;
if(!ns)
return CURLE_OUT_OF_MEMORY;
@@
-172,17
+172,16
@@
CURLcode Curl_urldecode(struct SessionHandle *data,
in = curlx_ultouc(hex); /* this long is never bigger than 255 anyway */
in = curlx_ultouc(hex); /* this long is never bigger than 255 anyway */
- res
ult
= Curl_convert_from_network(data, &in, 1);
- if(res
ult
) {
+ res = Curl_convert_from_network(data, &in, 1);
+ if(res) {
/* Curl_convert_from_network calls failf if unsuccessful */
free(ns);
/* Curl_convert_from_network calls failf if unsuccessful */
free(ns);
- return res
ult
;
+ return res;
}
string+=2;
alloc-=2;
}
}
string+=2;
alloc-=2;
}
-
if(reject_ctrl && (in < 0x20)) {
free(ns);
return CURLE_URL_MALFORMAT;
if(reject_ctrl && (in < 0x20)) {
free(ns);
return CURLE_URL_MALFORMAT;