From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 13 Jan 2025 14:02:18 +0000 (+0100)
Subject: sw-collector: Fix build with DEBUG_LEVEL < 1
X-Git-Tag: android-2.5.3~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41538cf259eef2d42a891a320d7b3a16b8cdfbd8;p=thirdparty%2Fstrongswan.git

sw-collector: Fix build with DEBUG_LEVEL < 1
---

diff --git a/src/sw-collector/sw-collector.c b/src/sw-collector/sw-collector.c
index 728db4f4ab..89b945a7d8 100644
--- a/src/sw-collector/sw-collector.c
+++ b/src/sw-collector/sw-collector.c
@@ -451,7 +451,8 @@ static int list_identifiers(sw_collector_db_t *db, sw_collector_db_query_t type)
 {
 	enumerator_t *e;
 	char *name, *package, *version;
-	uint32_t sw_id, count = 0, installed_count = 0, installed;
+	uint32_t sw_id, installed;
+	uint32_t count DBG_UNUSED = 0, installed_count DBG_UNUSED = 0;
 
 	e = db->create_sw_enumerator(db, type, NULL);
 	if (!e)
@@ -492,7 +493,7 @@ static bool query_registry(sw_collector_rest_api_t *rest_api, bool installed)
 	sw_collector_db_query_t type;
 	enumerator_t *enumerator;
 	char *sw_id;
-	int count = 0;
+	int count DBG_UNUSED = 0;
 
 	type = installed ? SW_QUERY_INSTALLED : SW_QUERY_REMOVED;
 	enumerator = rest_api->create_sw_enumerator(rest_api, type);
@@ -557,7 +558,8 @@ static int generate_tags(sw_collector_db_t *db, bool full_tags,
 	enumerator_t *enumerator;
 	uint32_t sw_id;
 	bool installed;
-	int count = 0, installed_count = 0, status = EXIT_FAILURE;
+	int count DBG_UNUSED = 0, installed_count DBG_UNUSED = 0;
+	int status = EXIT_FAILURE;
 
 	swid_gen = swid_gen_create();
 	rest_api = sw_collector_rest_api_create(db);
diff --git a/src/sw-collector/sw_collector_history.c b/src/sw-collector/sw_collector_history.c
index 5a26ff12b4..b608ba3c67 100644
--- a/src/sw-collector/sw_collector_history.c
+++ b/src/sw-collector/sw_collector_history.c
@@ -378,7 +378,7 @@ end:
 METHOD(sw_collector_history_t, merge_installed_packages, bool,
 	private_sw_collector_history_t *this)
 {
-	uint32_t sw_id, count = 0;
+	uint32_t sw_id, count DBG_UNUSED = 0;
 	char *package, *arch, *version, *v1, *name, *n1;
 	bool installed, success = FALSE;
 	sw_collector_dpkg_t *dpkg;