diff options
| -rw-r--r-- | lib/curl_fnmatch.c | 6 | ||||
| -rw-r--r-- | lib/ftp.c | 2 | ||||
| -rw-r--r-- | lib/ftplistparser.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c index 410938a29..6485c97bb 100644 --- a/lib/curl_fnmatch.c +++ b/lib/curl_fnmatch.c @@ -280,7 +280,10 @@ static int setcharset(unsigned char **p, unsigned char *charset) state = CURLFNM_SCHS_DEFAULT; } else - return SETCHARSET_FAIL; + /* used 'goto fail' instead of 'return SETCHARSET_FAIL' to avoid a + * nonsense warning 'statement not reached' at end of the fnc when + * compiling on Solaris */ + goto fail; break; case CURLFNM_SCHS_RIGHTBRLEFTBR: if(c == ']') { @@ -294,6 +297,7 @@ static int setcharset(unsigned char **p, unsigned char *charset) break; } } +fail: return SETCHARSET_FAIL; } @@ -3628,10 +3628,8 @@ static CURLcode wc_statemach(struct connectdata *conn) finfo->filename); wildcard->state = CURLWC_SKIP; return wc_statemach(conn); - break; case CURL_CHUNK_BGN_FUNC_FAIL: return CURLE_CHUNK_FAILED; - break; } } diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c index 4e10c4331..947b71417 100644 --- a/lib/ftplistparser.c +++ b/lib/ftplistparser.c @@ -452,7 +452,6 @@ size_t ftp_parselist(char *buffer, size_t size, size_t nmemb, void *connptr) default: PL_ERROR(conn, CURLE_FTP_BAD_FILE_LIST); return bufflen; - break; } parser->state.UNIX.main = PL_UNIX_PERMISSION; parser->item_length = 0; @@ -993,7 +992,6 @@ size_t ftp_parselist(char *buffer, size_t size, size_t nmemb, void *connptr) break; default: return bufflen+1; - break; } i++; |