Merge pull request #781 from ggtakec/master

Fixed an error by cppcheck on OSX
This commit is contained in:
Takeshi Nakatani 2018-06-24 12:22:35 +09:00 committed by GitHub
commit 4a7c4a9e9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1633,10 +1633,10 @@ int S3fsCurl::CurlDebugFunc(CURL* hcurl, curl_infotype type, char* data, size_t
int newline = 0;
if (eol == NULL) {
eol = (char*)memchr(p, '\r', remaining);
} else if (eol > p && *(eol - 1) == '\r') {
newline++;
}
if (eol != NULL) {
} else {
if (eol > p && *(eol - 1) == '\r') {
newline++;
}
newline++;
eol++;
}