moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

ftplistparser: We prefer 'CURLcode result'

Browse Source
This commit is contained in:
Steve Holme 2014-11-01 12:06:03 +00:00
parent 795885f454
commit beb478a24b
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/ftplistparser.c
View File

@ -365,7 +365,7 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
struct ftp_parselist_data *parser = tmpdata->parser; struct ftp_parselist_data *parser = tmpdata->parser;
struct curl_fileinfo *finfo; struct curl_fileinfo *finfo;
unsigned long i = 0; unsigned long i = 0;
CURLcode rc; CURLcode result;
if(parser->error) { /* error in previous call */ if(parser->error) { /* error in previous call */
/* scenario: /* scenario:
@ -758,9 +758,9 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
finfo->b_data[parser->item_offset + parser->item_length - 1] = 0; finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;
parser->offsets.filename = parser->item_offset; parser->offsets.filename = parser->item_offset;
parser->state.UNIX.main = PL_UNIX_FILETYPE; parser->state.UNIX.main = PL_UNIX_FILETYPE;
rc = ftp_pl_insert_finfo(conn, finfo); result = ftp_pl_insert_finfo(conn, finfo);
if(rc) { if(result) {
PL_ERROR(conn, rc); PL_ERROR(conn, result);
return bufflen; return bufflen;
} }
} }
@ -770,9 +770,9 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
finfo->b_data[parser->item_offset + parser->item_length] = 0; finfo->b_data[parser->item_offset + parser->item_length] = 0;
parser->offsets.filename = parser->item_offset; parser->offsets.filename = parser->item_offset;
parser->state.UNIX.main = PL_UNIX_FILETYPE; parser->state.UNIX.main = PL_UNIX_FILETYPE;
rc = ftp_pl_insert_finfo(conn, finfo); result = ftp_pl_insert_finfo(conn, finfo);
if(rc) { if(result) {
PL_ERROR(conn, rc); PL_ERROR(conn, result);
return bufflen; return bufflen;
} }
} }
@ -866,9 +866,9 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
else if(c == '\n') { else if(c == '\n') {
finfo->b_data[parser->item_offset + parser->item_length - 1] = 0; finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;
parser->offsets.symlink_target = parser->item_offset; parser->offsets.symlink_target = parser->item_offset;
rc = ftp_pl_insert_finfo(conn, finfo); result = ftp_pl_insert_finfo(conn, finfo);
if(rc) { if(result) {
PL_ERROR(conn, rc); PL_ERROR(conn, result);
return bufflen; return bufflen;
} }
parser->state.UNIX.main = PL_UNIX_FILETYPE; parser->state.UNIX.main = PL_UNIX_FILETYPE;
@ -878,9 +878,9 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
if(c == '\n') { if(c == '\n') {
finfo->b_data[parser->item_offset + parser->item_length - 1] = 0; finfo->b_data[parser->item_offset + parser->item_length - 1] = 0;
parser->offsets.symlink_target = parser->item_offset; parser->offsets.symlink_target = parser->item_offset;
rc = ftp_pl_insert_finfo(conn, finfo); result = ftp_pl_insert_finfo(conn, finfo);
if(rc) { if(result) {
PL_ERROR(conn, rc); PL_ERROR(conn, result);
return bufflen; return bufflen;
} }
parser->state.UNIX.main = PL_UNIX_FILETYPE; parser->state.UNIX.main = PL_UNIX_FILETYPE;
@ -1011,9 +1011,9 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
parser->offsets.filename = parser->item_offset; parser->offsets.filename = parser->item_offset;
finfo->b_data[finfo->b_used - 1] = 0; finfo->b_data[finfo->b_used - 1] = 0;
parser->offsets.filename = parser->item_offset; parser->offsets.filename = parser->item_offset;
rc = ftp_pl_insert_finfo(conn, finfo); result = ftp_pl_insert_finfo(conn, finfo);
if(rc) { if(result) {
PL_ERROR(conn, rc); PL_ERROR(conn, result);
return bufflen; return bufflen;
} }
parser->state.NT.main = PL_WINNT_DATE; parser->state.NT.main = PL_WINNT_DATE;
@ -1023,9 +1023,9 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
case PL_WINNT_FILENAME_WINEOL: case PL_WINNT_FILENAME_WINEOL:
if(c == '\n') { if(c == '\n') {
parser->offsets.filename = parser->item_offset; parser->offsets.filename = parser->item_offset;
rc = ftp_pl_insert_finfo(conn, finfo); result = ftp_pl_insert_finfo(conn, finfo);
if(rc) { if(result) {
PL_ERROR(conn, rc); PL_ERROR(conn, result);
return bufflen; return bufflen;
} }
parser->state.NT.main = PL_WINNT_DATE; parser->state.NT.main = PL_WINNT_DATE;