Merge branch 'giubacc-misplaced-goto'

[fio.git] / engines / http.c

diff --git a/engines/http.c b/engines/http.c
index 35c44871da636b79f77545c078ff5ca3da1a8d8f..b6df70f8d8a8e461632f7caf5af5bfd8157b0e30 100644 (file)
--- a/engines/http.c
+++ b/engines/http.c
@@ -297,7 +297,7 @@ static int _curl_trace(CURL *handle, curl_infotype type,
        switch (type) {
        case CURLINFO_TEXT:
                fprintf(stderr, "== Info: %s", data);
-               fallthrough;
+               fio_fallthrough;
        default:
        case CURLINFO_SSL_DATA_OUT:
        case CURLINFO_SSL_DATA_IN:
@@ -388,7 +388,7 @@ static void _add_aws_auth_header(CURL *curl, struct curl_slist *slist, struct ht
 
        signature = _conv_hex(md, SHA256_DIGEST_LENGTH);
 
-       /* Surpress automatic Accept: header */
+       /* Suppress automatic Accept: header */
        slist = curl_slist_append(slist, "Accept:");
 
        snprintf(s, sizeof(s), "x-amz-content-sha256: %s", dsha);
@@ -419,7 +419,7 @@ static void _add_swift_header(CURL *curl, struct curl_slist *slist, struct http_
        if (op == DDIR_WRITE) {
                dsha = _gen_hex_md5(buf, len);
        }
-       /* Surpress automatic Accept: header */
+       /* Suppress automatic Accept: header */
        slist = curl_slist_append(slist, "Accept:");
 
        snprintf(s, sizeof(s), "etag: %s", dsha);
@@ -526,8 +526,8 @@ static enum fio_q_status fio_http_queue(struct thread_data *td,
                        if (status == 100 || (status >= 200 && status <= 204))
                                goto out;
                        log_err("DDIR_WRITE failed with HTTP status code %ld\n", status);
-                       goto err;
                }
+               goto err;
        } else if (io_u->ddir == DDIR_READ) {
                curl_easy_setopt(http->curl, CURLOPT_READDATA, NULL);
                curl_easy_setopt(http->curl, CURLOPT_WRITEDATA, &_curl_stream);