Commit 9e550b32 authored by Matthew Booth's avatar Matthew Booth Committed by Kevin Wolf
Browse files

curl: Remove unnecessary use of goto 



This isn't any of the usually acceptable uses of goto.

Signed-off-by: default avatarMatthew Booth <mbooth@redhat.com>
Tested-by: default avatarRichard W.M. Jones <rjones@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f6246509

block/curl.c

+27 −28
Original line number Diff line number Diff line
@@ -343,15 +343,15 @@ static CURLState *curl_init_state(BDRVCURLState *s) 
        }

    } while(!state);



    if (state->curl)

        goto has_curl;



    if (!state->curl) {

        state->curl = curl_easy_init();

    if (!state->curl)

        if (!state->curl) {

            return NULL;

        }

        curl_easy_setopt(state->curl, CURLOPT_URL, s->url);

        curl_easy_setopt(state->curl, CURLOPT_TIMEOUT, 5);

    curl_easy_setopt(state->curl, CURLOPT_WRITEFUNCTION, (void *)curl_read_cb);

        curl_easy_setopt(state->curl, CURLOPT_WRITEFUNCTION,

                         (void *)curl_read_cb);

        curl_easy_setopt(state->curl, CURLOPT_WRITEDATA, (void *)state);

        curl_easy_setopt(state->curl, CURLOPT_PRIVATE, (void *)state);

        curl_easy_setopt(state->curl, CURLOPT_AUTOREFERER, 1);
@@ -374,8 +374,7 @@ static CURLState *curl_init_state(BDRVCURLState *s) 
#ifdef DEBUG_VERBOSE

        curl_easy_setopt(state->curl, CURLOPT_VERBOSE, 1);

#endif



has_curl:

    }



    state->s = s;