From 5d30df9daf58a4e1fc23d02596ea29878027e6da Mon Sep 17 00:00:00 2001
From: Otavio Pontes <otavio.pontes@intel.com>
Date: Tue, 5 Jun 2018 18:01:50 +0000
Subject: [PATCH] curl: Remove unused code

req_version and curr_version in curl.c weren't used anywhere. Probably
this is a left over. Removing them.
---
 src/bundle.c  |  6 ------
 src/curl.c    | 12 ------------
 src/search.c  |  2 --
 src/swupd.h   |  2 --
 src/version.c |  3 ---
 5 files changed, 25 deletions(-)

diff --git a/src/bundle.c b/src/bundle.c
index 7f899374..6b2333b6 100644
--- a/src/bundle.c
+++ b/src/bundle.c
@@ -63,7 +63,6 @@ int list_installable_bundles()
 		fprintf(stderr, "Error: Unable to determine current OS version\n");
 		return ECURRENT_VERSION;
 	}
-	swupd_curl_set_current_version(current_version);
 
 	mix_exists = (check_mix_exists() & system_on_mix());
 	MoM = load_mom(current_version, false, mix_exists);
@@ -97,7 +96,6 @@ static int load_bundle_manifest(const char *bundle_name, struct list *subs, int
 
 	*submanifest = NULL;
 
-	swupd_curl_set_current_version(version);
 	mom = load_mom(version, false, false);
 	if (!mom) {
 		return EMOM_NOTFOUND;
@@ -453,8 +451,6 @@ int remove_bundle(const char *bundle_name)
 
 	mix_exists = (check_mix_exists() & system_on_mix());
 
-	swupd_curl_set_current_version(current_version);
-
 	current_mom = load_mom(current_version, false, mix_exists);
 	if (!current_mom) {
 		fprintf(stderr, "Unable to download/verify %d Manifest.MoM\n", current_version);
@@ -852,8 +848,6 @@ int install_bundles_frontend(char **bundles)
 
 	mix_exists = (check_mix_exists() & system_on_mix());
 
-	swupd_curl_set_current_version(current_version);
-
 	mom = load_mom(current_version, false, mix_exists);
 	if (!mom) {
 		fprintf(stderr, "Cannot load official manifest MoM for version %i\n", current_version);
diff --git a/src/curl.c b/src/curl.c
index 69c2b157..53a27494 100644
--- a/src/curl.c
+++ b/src/curl.c
@@ -48,8 +48,6 @@
 
 static CURL *curl = NULL;
 
-static int curr_version = -1;
-static int req_version = -1;
 static bool resume_download_enabled = true;
 
 /* these are used to handle alternative trust locations */
@@ -196,16 +194,6 @@ void swupd_curl_deinit(void)
 	curl_global_cleanup();
 }
 
-void swupd_curl_set_current_version(int v)
-{
-	curr_version = v;
-}
-
-void swupd_curl_set_requested_version(int v)
-{
-	req_version = v;
-}
-
 static size_t filesize_from_header_cb(void UNUSED_PARAM *func, size_t size, size_t nmemb, void UNUSED_PARAM *data)
 {
 	/* Drop the header, we just want file size */
diff --git a/src/search.c b/src/search.c
index efb3ffca..1982593e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -792,8 +792,6 @@ static int download_manifests(struct manifest **MoM, struct list **subs)
 		return ECURRENT_VERSION;
 	}
 
-	swupd_curl_set_current_version(current_version);
-
 	*MoM = load_mom(current_version, false, false);
 	if (!(*MoM)) {
 		fprintf(stderr, "Cannot load official manifest MoM for version %i\n", current_version);
diff --git a/src/swupd.h b/src/swupd.h
index 2167f4f6..4946f690 100644
--- a/src/swupd.h
+++ b/src/swupd.h
@@ -299,8 +299,6 @@ extern int update_device_latest_version(int version);
 extern int swupd_curl_init(void);
 extern void swupd_curl_deinit(void);
 extern int swupd_curl_check_network(void);
-extern void swupd_curl_set_current_version(int v);
-extern void swupd_curl_set_requested_version(int v);
 extern double swupd_query_url_content_size(char *url);
 extern CURLcode swupd_download_file_start(struct file *file);
 extern CURLcode swupd_download_file_complete(CURLcode curl_ret, struct file *file);
diff --git a/src/version.c b/src/version.c
index 35258d99..cd8294f2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -164,7 +164,6 @@ int check_versions(int *current_version,
 		fprintf(stderr, "Update of dev build not supported %d\n", *current_version);
 		return -1;
 	}
-	swupd_curl_set_current_version(*current_version);
 
 	/* set preferred version and content server urls */
 	if (*current_version < 0) {
@@ -182,8 +181,6 @@ int check_versions(int *current_version,
 		}
 	}
 
-	swupd_curl_set_requested_version(*server_version);
-
 	return 0;
 }