generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlglob: avoid error code translation

Browse Source 
By using the correct values from the start we don't have to translate
them!
This commit is contained in:
Daniel Stenberg
2013-09-06 14:20:03 +02:00
parent 2a7f1425d9
commit d6cda9e8ab
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tool_urlglob.c
View File

@@ -31,8 +31,8 @@
typedef enum { typedef enum {
GLOB_OK, GLOB_OK,
GLOB_NO_MEM, GLOB_NO_MEM = CURLE_OUT_OF_MEMORY,
GLOB_ERROR GLOB_ERROR = CURLE_URL_MALFORMAT
} GlobCode; } GlobCode;
void glob_cleanup(URLGlob* glob); void glob_cleanup(URLGlob* glob);
@@ -423,14 +423,12 @@ int glob_url(URLGlob** glob, char* url, unsigned long *urlnum, FILE *error)
else { else {
if(error && glob_expand->errormsg[0]) { if(error && glob_expand->errormsg[0]) {
/* send error description to the error-stream */ /* send error description to the error-stream */
fprintf(error, "curl: (%d) [globbing] %s", fprintf(error, "curl: (%d) [globbing] %s", res, glob_expand->errormsg);
(res == GLOB_NO_MEM) ? CURLE_OUT_OF_MEMORY : CURLE_URL_MALFORMAT,
glob_expand->errormsg);
} }
/* it failed, we cleanup */ /* it failed, we cleanup */
glob_cleanup(glob_expand); glob_cleanup(glob_expand);
*urlnum = 1; *urlnum = 1;
return (res == GLOB_NO_MEM) ? CURLE_OUT_OF_MEMORY : CURLE_URL_MALFORMAT; return res;
} }
*glob = glob_expand; *glob = glob_expand;