From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 29 Feb 2024 14:10:59 +0000 (+0100)
Subject: Remove obvious empty statements (i.e. stray semicolons)
X-Git-Tag: 5.9.14dr2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dee8587f0481292c065a1b76e52cd31082b3054;p=thirdparty%2Fstrongswan.git

Remove obvious empty statements (i.e. stray semicolons)
---

diff --git a/scripts/pubkey_speed.c b/scripts/pubkey_speed.c
index 87b6d0e442..2b033ea1d4 100644
--- a/scripts/pubkey_speed.c
+++ b/scripts/pubkey_speed.c
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
 			printf("creating signature failed\n");
 			exit(1);
 		}
-	};
+	}
 	printf("sign()/s: %8.1f   ", rounds / end_timing(&timing));
 
 	public = private->get_public_key(private);
diff --git a/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c b/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c
index f3d001d932..7c71a78965 100644
--- a/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c
+++ b/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c
@@ -208,7 +208,7 @@ static bool read_triplets(private_eap_sim_file_triplets_t *this, char *path)
 					parse_token(triplet->kc, token, SIM_KC_LEN);
 					continue;
 				default:
-					break;;
+					break;
 			}
 			break;
 		}
diff --git a/src/libcharon/plugins/forecast/forecast_listener.c b/src/libcharon/plugins/forecast/forecast_listener.c
index e07469bb73..4983835f19 100644
--- a/src/libcharon/plugins/forecast/forecast_listener.c
+++ b/src/libcharon/plugins/forecast/forecast_listener.c
@@ -544,7 +544,7 @@ METHOD(listener_t, child_rekey, bool,
 	private_forecast_listener_t *this, ike_sa_t *ike_sa,
 	child_sa_t *old, child_sa_t *new)
 {
-	struct iptc_handle *ipth;;
+	struct iptc_handle *ipth;
 	host_t *lhost, *rhost;
 
 	lhost = ike_sa->get_my_host(ike_sa);
diff --git a/src/libcharon/plugins/ha/ha_message.c b/src/libcharon/plugins/ha/ha_message.c
index 41f7c0c257..1a528d46cc 100644
--- a/src/libcharon/plugins/ha/ha_message.c
+++ b/src/libcharon/plugins/ha/ha_message.c
@@ -283,7 +283,7 @@ METHOD(ha_message_t, add_attribute, void,
 			*(uint16_t*)(this->buf.ptr + this->buf.len) = htons(chunk.len);
 			memcpy(this->buf.ptr + this->buf.len + sizeof(uint16_t),
 				   chunk.ptr, chunk.len);
-			this->buf.len += chunk.len + sizeof(uint16_t);;
+			this->buf.len += chunk.len + sizeof(uint16_t);
 			break;
 		}
 		/** traffic_selector_t */
diff --git a/src/libcharon/plugins/medcli/medcli_config.c b/src/libcharon/plugins/medcli/medcli_config.c
index 3211a49f17..59a9358a12 100644
--- a/src/libcharon/plugins/medcli/medcli_config.c
+++ b/src/libcharon/plugins/medcli/medcli_config.c
@@ -340,7 +340,7 @@ METHOD(backend_t, create_peer_cfg_enumerator, enumerator_t*,
 static job_requeue_t initiate_config(peer_cfg_t *peer_cfg)
 {
 	enumerator_t *enumerator;
-	child_cfg_t *child_cfg = NULL;;
+	child_cfg_t *child_cfg = NULL;
 
 	enumerator = peer_cfg->create_child_cfg_enumerator(peer_cfg);
 	enumerator->enumerate(enumerator, &child_cfg);
diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c
index 91dddfeaa7..950055b447 100644
--- a/src/libcharon/plugins/smp/smp.c
+++ b/src/libcharon/plugins/smp/smp.c
@@ -653,7 +653,7 @@ static job_requeue_t process(int *fdp)
 	if (reader == NULL)
 	{
 		DBG1(DBG_CFG, "opening SMP XML reader failed");
-		return JOB_REQUEUE_FAIR;;
+		return JOB_REQUEUE_FAIR;
 	}
 
 	/* read message type and id */
@@ -681,7 +681,7 @@ static job_requeue_t process(int *fdp)
 		}
 	}
 	xmlFreeTextReader(reader);
-	return JOB_REQUEUE_FAIR;;
+	return JOB_REQUEUE_FAIR;
 }
 
 /**
@@ -703,7 +703,7 @@ static job_requeue_t dispatch(private_smp_t *this)
 	{
 		DBG1(DBG_CFG, "accepting SMP XML socket failed: %s", strerror(errno));
 		sleep(1);
-		return JOB_REQUEUE_FAIR;;
+		return JOB_REQUEUE_FAIR;
 	}
 
 	fdp = malloc_thing(int);
diff --git a/src/libcharon/plugins/socket_default/socket_default_socket.c b/src/libcharon/plugins/socket_default/socket_default_socket.c
index 89d2ac15c8..5f25684950 100644
--- a/src/libcharon/plugins/socket_default/socket_default_socket.c
+++ b/src/libcharon/plugins/socket_default/socket_default_socket.c
@@ -595,7 +595,7 @@ METHOD(socket_t, sender, status_t,
 	}
 
 	memset(&msg, 0, sizeof(struct msghdr));
-	msg.msg_name = dst->get_sockaddr(dst);;
+	msg.msg_name = dst->get_sockaddr(dst);
 	msg.msg_namelen = *dst->get_sockaddr_len(dst);
 	iov.iov_base = data.ptr;
 	iov.iov_len = data.len;
diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
index fc1250c44c..c1c0a3252e 100644
--- a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
+++ b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
@@ -604,7 +604,7 @@ METHOD(socket_t, sender, status_t,
 	DBG2(DBG_NET, "sending packet: from %#H to %#H", src, dst);
 
 	memset(&msg, 0, sizeof(struct msghdr));
-	msg.msg_name = dst->get_sockaddr(dst);;
+	msg.msg_name = dst->get_sockaddr(dst);
 	msg.msg_namelen = *dst->get_sockaddr_len(dst);
 	iov.iov_base = data.ptr;
 	iov.iov_len = data.len;
diff --git a/src/libcharon/plugins/vici/suites/test_message.c b/src/libcharon/plugins/vici/suites/test_message.c
index 755019c5ca..3bfef1e408 100644
--- a/src/libcharon/plugins/vici/suites/test_message.c
+++ b/src/libcharon/plugins/vici/suites/test_message.c
@@ -167,7 +167,7 @@ static void compare_vici(enumerator_t *parse, enumerator_t *tmpl)
 {
 	vici_type_t type, ttype;
 	char *name, *tname;
-	chunk_t data, tdata;;
+	chunk_t data, tdata;
 
 	while (TRUE)
 	{
diff --git a/src/libcharon/sa/ikev1/iv_manager.c b/src/libcharon/sa/ikev1/iv_manager.c
index 07d7a710c7..53713fe562 100644
--- a/src/libcharon/sa/ikev1/iv_manager.c
+++ b/src/libcharon/sa/ikev1/iv_manager.c
@@ -144,7 +144,7 @@ static bool generate_iv(private_iv_manager_t *this, iv_data_t *iv)
 	else
 	{
 		/* initial phase 2 IV = hash(last_phase1_block | mid) */
-		uint32_t net;;
+		uint32_t net;
 		chunk_t data;
 
 		net = htonl(iv->mid);
diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
index a40941e668..3e80a7d2de 100644
--- a/src/libcharon/sa/ikev2/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@ -1416,7 +1416,7 @@ static linked_list_t* get_ts_if_nat_transport(private_child_create_t *this,
 static child_cfg_t* select_child_cfg(private_child_create_t *this)
 {
 	peer_cfg_t *peer_cfg;
-	child_cfg_t *child_cfg = NULL;;
+	child_cfg_t *child_cfg = NULL;
 
 	peer_cfg = this->ike_sa->get_peer_cfg(this->ike_sa);
 	if (peer_cfg && this->tsi && this->tsr)
diff --git a/src/libcharon/tests/suites/test_mem_pool.c b/src/libcharon/tests/suites/test_mem_pool.c
index 799426e397..4db448b4b1 100644
--- a/src/libcharon/tests/suites/test_mem_pool.c
+++ b/src/libcharon/tests/suites/test_mem_pool.c
@@ -30,7 +30,7 @@ static void assert_host(char *expected, host_t *host)
 		verifier = host_create_from_string(expected, 0);
 		ck_assert_msg(host, "expected IP %+H != NULL", verifier);
 		ck_assert_msg(verifier->ip_equals(verifier, host), "expected IP %+H != "
-					  "%+H", verifier, host);;
+					  "%+H", verifier, host);
 		verifier->destroy(verifier);
 	}
 }
diff --git a/src/libradius/radius_socket.c b/src/libradius/radius_socket.c
index 91771b4535..8635e93cb4 100644
--- a/src/libradius/radius_socket.c
+++ b/src/libradius/radius_socket.c
@@ -372,7 +372,7 @@ METHOD(radius_socket_t, destroy, void,
 	if (this->auth_fd != -1)
 	{
 		close(this->auth_fd);
-	};
+	}
 	if (this->acct_fd != -1)
 	{
 		close(this->acct_fd);
diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c
index c89efdd21b..49a77f2e21 100644
--- a/src/libstrongswan/plugins/mysql/mysql_database.c
+++ b/src/libstrongswan/plugins/mysql/mysql_database.c
@@ -333,7 +333,7 @@ static MYSQL_STMT* run(MYSQL *mysql, char *sql, va_list *args)
 				}
 				case DB_TEXT:
 				{
-					bind[i].buffer_type = MYSQL_TYPE_STRING;;
+					bind[i].buffer_type = MYSQL_TYPE_STRING;
 					bind[i].buffer = va_arg(*args, char*);
 					if (bind[i].buffer)
 					{
@@ -399,7 +399,7 @@ typedef struct {
 	conn_t *conn;
 	/** value for INT, UINT, double */
 	union {
-		void *p_void;;
+		void *p_void;
 		int *p_int;
 		u_int *p_uint;
 		double *p_double;
diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c b/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
index 83b6f2c7ef..6a54b3f3fe 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
@@ -199,7 +199,7 @@ CK_MECHANISM_PTR pkcs11_signature_scheme_to_mech(pkcs11_library_t *p11,
 	CK_MECHANISM_PTR mechanism;
 	CK_RSA_PKCS_PSS_PARAMS *rsa_pkcs_pss_params;
 	rsa_pss_params_t *rsa_pss_params;
-	hash_algorithm_t hash_alg = HASH_UNKNOWN;;
+	hash_algorithm_t hash_alg = HASH_UNKNOWN;
 	int i;
 
 	for (i = 0; i < countof(mappings); i++)
diff --git a/src/libstrongswan/tests/suites/test_array.c b/src/libstrongswan/tests/suites/test_array.c
index 52f27ea904..ed70a7502a 100644
--- a/src/libstrongswan/tests/suites/test_array.c
+++ b/src/libstrongswan/tests/suites/test_array.c
@@ -114,7 +114,7 @@ START_TEST(test_append_obj)
 
 		array_insert(array, ARRAY_HEAD, &y[3]);
 		array_insert(array, ARRAY_TAIL, &y[4]);
-		ck_assert_int_eq(array_count(array), 2);;
+		ck_assert_int_eq(array_count(array), 2);
 
 		/* 3, 4 */
 
diff --git a/src/libstrongswan/utils/printf_hook/printf_hook_glibc.c b/src/libstrongswan/utils/printf_hook/printf_hook_glibc.c
index 6998fe11e5..d902abc712 100644
--- a/src/libstrongswan/utils/printf_hook/printf_hook_glibc.c
+++ b/src/libstrongswan/utils/printf_hook/printf_hook_glibc.c
@@ -68,7 +68,7 @@ struct printf_hook_data_t {
 	/**
 	 * Output FILE stream
 	 */
-	FILE *stream;;
+	FILE *stream;
 };
 
 /* A-Z | 6 other chars | a-z */
diff --git a/src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.c b/src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.c
index b560f271b7..777aac253d 100644
--- a/src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.c
+++ b/src/libtnccs/plugins/tnc_imv/tnc_imv_recommendations.c
@@ -186,13 +186,13 @@ METHOD(recommendations_t, have_recommendation, bool,
 						if (final_rec != TNC_IMV_ACTION_RECOMMENDATION_ALLOW)
 						{
 							final_rec = entry->rec;
-						};
+						}
 						break;
 					case TNC_IMV_ACTION_RECOMMENDATION_NO_ACCESS:
 						if (final_rec == TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION)
 						{
 							final_rec = entry->rec;
-						};
+						}
 						break;
 					case TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION:
 						break;
diff --git a/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_reason_string_msg.c b/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_reason_string_msg.c
index 99690e317b..9cef1503a6 100644
--- a/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_reason_string_msg.c
+++ b/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_reason_string_msg.c
@@ -109,7 +109,7 @@ METHOD(pb_tnc_msg_t, process, status_t,
 		reader->destroy(reader);
 		*offset = 0;
 		return FAILED;
-	};
+	}
 	this->reason_string = chunk_clone(this->reason_string);
 
 	if (this->reason_string.len &&
@@ -127,7 +127,7 @@ METHOD(pb_tnc_msg_t, process, status_t,
 		reader->destroy(reader);
 		*offset = 4 + this->reason_string.len;
 		return FAILED;
-	};
+	}
 	this->language_code = chunk_clone(this->language_code);
 	reader->destroy(reader);
 
diff --git a/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_remediation_parameters_msg.c b/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_remediation_parameters_msg.c
index ccb44a55ee..2f1072cae1 100644
--- a/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_remediation_parameters_msg.c
+++ b/src/libtnccs/plugins/tnccs_20/messages/ietf/pb_remediation_parameters_msg.c
@@ -154,7 +154,7 @@ METHOD(pb_tnc_msg_t, process, status_t,
 		{
 			DBG1(DBG_TNC, "insufficient data for remediation string");
 			goto end;
-		};
+		}
 		*offset += 4;
 
 		pos = memchr(this->string.ptr, '\0', this->string.len);
@@ -170,7 +170,7 @@ METHOD(pb_tnc_msg_t, process, status_t,
 		{
 			DBG1(DBG_TNC, "insufficient data for remediation string lang code");
 			goto end;
-		};
+		}
 		*offset += 1;
 
 		pos = memchr(this->lang_code.ptr, '\0', this->lang_code.len);
diff --git a/src/libtpmtss/tpm_tss_tss2_v2.c b/src/libtpmtss/tpm_tss_tss2_v2.c
index 6deefe910f..95fe05c032 100644
--- a/src/libtpmtss/tpm_tss_tss2_v2.c
+++ b/src/libtpmtss/tpm_tss_tss2_v2.c
@@ -814,7 +814,7 @@ static bool init_pcr_selection(private_tpm_tss_tss2_t *this, uint32_t pcrs,
 	/* initialize the PCR Selection structure,*/
 	pcr_sel->count = 1;
 	pcr_sel->pcrSelections[0].hash = hash_alg_to_tpm_alg_id(alg);
-;
+
 	pcr_sel->pcrSelections[0].sizeofSelect = 3;
 	pcr_sel->pcrSelections[0].pcrSelect[0] = 0;
 	pcr_sel->pcrSelections[0].pcrSelect[1] = 0;
diff --git a/src/swanctl/commands/list_authorities.c b/src/swanctl/commands/list_authorities.c
index 37ff50819e..a78b5a2a01 100644
--- a/src/swanctl/commands/list_authorities.c
+++ b/src/swanctl/commands/list_authorities.c
@@ -97,7 +97,7 @@ static int list_authorities(vici_conn_t *conn)
 	vici_req_t *req;
 	vici_res_t *res;
 	command_format_options_t format = COMMAND_FORMAT_NONE;
-	char *arg, *ca_name = NULL;;
+	char *arg, *ca_name = NULL;
 	int ret = 0;
 
 	while (TRUE)