From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 2 May 2023 12:15:43 +0000 (+0200)
Subject: sw-collector: Fix build with DEBUG_LEVEL < 1
X-Git-Tag: 5.9.11rc1~12^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e78d9fcec88e2262d0acfdf190578f08c4ad6b3;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 1685fdd299..728db4f4ab 100644
--- a/src/sw-collector/sw-collector.c
+++ b/src/sw-collector/sw-collector.c
@@ -451,7 +451,7 @@ 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, removed_count, installed;
+	uint32_t sw_id, count = 0, installed_count = 0, installed;
 
 	e = db->create_sw_enumerator(db, type, NULL);
 	if (!e)
@@ -467,14 +467,14 @@ static int list_identifiers(sw_collector_db_t *db, sw_collector_db_query_t type)
 		}
 		count++;
 	}
-	removed_count = count - installed_count;
 	e->destroy(e);
 
 	switch (type)
 	{
 		case SW_QUERY_ALL:
 			DBG1(DBG_IMC, "retrieved %u software identities with %u installed "
-				 "and %u removed", count, installed_count, removed_count);
+				 "and %u removed", count, installed_count,
+				 count - installed_count);
 			break;
 		case SW_QUERY_INSTALLED:
 			DBG1(DBG_IMC, "retrieved %u installed software identities", count);
@@ -629,7 +629,7 @@ static int migrate(sw_collector_db_t *db)
 
 	char *package, *arch, *version;
 	char package_filter[BUF_LEN];
-	int res, count = 0;
+	int res, count DBG_UNUSED = 0;
 	int status = EXIT_SUCCESS;
 	enumerator_t *enumerator;