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

diff --git a/scripts/pubkey_speed.c b/scripts/pubkey_speed.c
index 87b6d0e442283c623f8b9cadebbd7b7d51ba74c0..2b033ea1d4f2a53f41c685fa35ee97f23d76b605 100644 (file)
--- 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 f3d001d93201b099648bc74e2d252de5abe3a6a2..7c71a7896556b5b6c31b7b2f01ee07b076b3472d 100644 (file)
--- 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 e07469bb738abe3dafd355ae74caa90a2ec283aa..4983835f1914b376dbe68e85ef81f307b239c36a 100644 (file)
--- 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 41f7c0c25775274bfef18dd1218a92a20c2f34ad..1a528d46cce4fa43035a33543069fc7da0e7ba70 100644 (file)
--- 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 3211a49f1731dc04b228ec54a090530a657afbbf..59a9358a121f9baf53f51bc9dbcc036b3f89ee36 100644 (file)
--- 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 91dddfeaa797e8e2f171f7e490d0e01336a2807e..950055b44786923eeed647b6f31313ce7a9c1232 100644 (file)
--- 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 89d2ac15c84e7c3830e441314a50af763afb5f0e..5f256849504fd39f1e812be1f3e2e992bad7d1a7 100644 (file)
--- 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 fc1250c44c4fd71552ddb72e9f3d302a1b456ed1..c1c0a3252e4c2f5f0e6985344d703358ab40b4c1 100644 (file)
--- 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 755019c5ca74e9abed764e1ce15051a118a7f8ce..3bfef1e408922df062db8517b8a52515bab21ca8 100644 (file)
--- 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 07d7a710c7f4b9c1797f4912152ae34545473f51..53713fe56295ee164a089acaedf0997ce5d1e4bd 100644 (file)
--- 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 a40941e66859dca6eef01b3e3a065a9f74693162..3e80a7d2deee768e936d2216a8772d1344df7de6 100644 (file)
--- 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 799426e3971dd29f1a55e8584f6e295953107697..4db448b4b10078f812f49a2c6ce3158ad96d8f31 100644 (file)
--- 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 91771b4535fba924970417c08072d0d1046bbf52..8635e93cb4c3788ca9db6b9bb26d1778d22267d2 100644 (file)
--- 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 c89efdd21bcdc5e4f095fb4585ed148c30cf38dc..49a77f2e217ad88207cc55e1b3ecedbfe2cf0fa5 100644 (file)
--- 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 83b6f2c7ef1e595b9cc62b1c3c736495670b69eb..6a54b3f3fedaa3171593f2a0f1cadc04c3a3422e 100644 (file)
--- 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 52f27ea904555fbbd45dd7aae2ee6b0e88b475fa..ed70a7502af5083c73dc7516dc7f8de90fd7fc3b 100644 (file)
--- 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 6998fe11e57a608ad2ae6cd29de45cde95e97473..d902abc71209a991354bad0a9f1d16409aaa273d 100644 (file)
--- 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 b560f271b7a04743f7b01b04c463f03a75928120..777aac253d57d31f5ac781a1f73b92e43dae7051 100644 (file)
--- 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 99690e317b8ad9a46e3436161d305d9b163cfe75..9cef1503a6fba9db2ec494eb1858757ab14fabe3 100644 (file)
--- 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 ccb44a55eebcb7902132a747dbbdb7921a52946b..2f1072cae1a8ba999b96443c83c677644177d9e1 100644 (file)
--- 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 6deefe910feff5b452520030846ba934b2b87656..95fe05c0321e4e427f7883ac4108370a7fc59b68 100644 (file)
--- 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 37ff50819e1c2ed1303eb2940f4b47dce44d9370..a78b5a2a010e937d769c87e13780ad787efdcd4f 100644 (file)
--- 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)