From 2fbf646b215b87bc8b94409e5c171c585c5f940b Mon Sep 17 00:00:00 2001 From: Navneet Gupta Date: Tue, 20 Jun 2017 16:18:39 -0500 Subject: [PATCH] IBM-Swift/Kitura-CouchDB#58 Remove check on uninitialized variable (#12) --- shim.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/shim.h b/shim.h index 5958b43..4b56b6f 100644 --- a/shim.h +++ b/shim.h @@ -56,24 +56,18 @@ static inline CURLcode curlHelperSetOptReadFunc(CURL *curl, void *userData, size static inline CURLcode curlHelperSetOptWriteFunc(CURL *curl, void *userData, size_t (*write_cb) (char *ptr, size_t size, size_t nmemb, void *userdata)) { - CURLcode rc; - if (rc == CURLE_OK) { - rc = curl_easy_setopt(curl, CURLOPT_WRITEDATA, userData); - if (rc == CURLE_OK) { - rc = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_cb); - } + CURLcode rc = curl_easy_setopt(curl, CURLOPT_WRITEDATA, userData); + if (rc == CURLE_OK) { + rc = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_cb); } return rc; } static inline CURLcode curlHelperSetOptHeaderFunc(CURL *curl, void *userData, size_t (*header_cb) (char *buffer, size_t size, size_t nmemb, void *userdata)) { - CURLcode rc; + CURLcode rc = curl_easy_setopt(curl, CURLOPT_HEADERDATA, userData); if (rc == CURLE_OK) { - rc = curl_easy_setopt(curl, CURLOPT_HEADERDATA, userData); - if (rc == CURLE_OK) { - rc = curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_cb); - } + rc = curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_cb); } return rc; }