Merge pull request #15215 from donaldsharp/pceplib_fixup

Compile issue fixups
FRRouting · Jan 25, 2024 · f31bc32 · f31bc32
2 parents 147f476 + e208a7e
commit f31bc32
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 117 deletions.
diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
@@ -1320,7 +1320,7 @@ static int rpki_create_socket(void *_cache)
 	else {
 		ssh_config = cache->tr_config.ssh_config;
 		host = ssh_config->host;
-		snprintf(s_port, sizeof(s_port), "%hu", ssh_config->port);
+		snprintf(s_port, sizeof(s_port), "%u", ssh_config->port);
 		port = s_port;
 
 		hints.ai_flags |= AI_NUMERICHOST;

diff --git a/pceplib/pcep_socket_comm_mock.c b/pceplib/pcep_socket_comm_mock.c
@@ -115,7 +115,7 @@ bool initialize_socket_comm_external_infra(
 	return true;
 }
 
-bool destroy_socket_comm_loop()
+bool destroy_socket_comm_loop(void)
 {
 	mock_socket_metadata.destroy_socket_comm_loop_times_called++;
 

diff --git a/pceplib/test/pcep_msg_messages_test.c b/pceplib/test/pcep_msg_messages_test.c
@@ -48,17 +48,17 @@ int pcep_messages_test_suite_teardown(void)
 	return 0;
 }
 
-void pcep_messages_test_setup()
+void pcep_messages_test_setup(void)
 {
 	versioning = create_default_pcep_versioning();
 }
 
-void pcep_messages_test_teardown()
+void pcep_messages_test_teardown(void)
 {
 	destroy_pcep_versioning(versioning);
 }
 
-void test_pcep_msg_create_open()
+void test_pcep_msg_create_open(void)
 {
 	uint8_t keepalive = 30;
 	uint8_t deadtimer = 60;
@@ -96,8 +96,7 @@ void test_pcep_msg_create_open()
 	pcep_msg_free_message(message);
 }
 
-
-void test_pcep_msg_create_request()
+void test_pcep_msg_create_request(void)
 {
 	/* First test with NULL objects */
 	struct pcep_message *message =
@@ -185,13 +184,11 @@ void test_pcep_msg_create_request()
 	pcep_msg_free_message(message);
 }
 
-
-void test_pcep_msg_create_request_svec()
+void test_pcep_msg_create_request_svec(void)
 {
 }
 
-
-void test_pcep_msg_create_reply_nopath()
+void test_pcep_msg_create_reply_nopath(void)
 {
 	struct pcep_object_rp *rp_obj =
 		pcep_obj_create_rp(0, false, false, false, false, 10, NULL);
@@ -219,8 +216,7 @@ void test_pcep_msg_create_reply_nopath()
 	pcep_msg_free_message(message);
 }
 
-
-void test_pcep_msg_create_reply()
+void test_pcep_msg_create_reply(void)
 {
 	/* First test with NULL ero and rp objects */
 	struct pcep_message *message = pcep_msg_create_reply(NULL, NULL);
@@ -268,8 +264,7 @@ void test_pcep_msg_create_reply()
 	pcep_msg_free_message(message);
 }
 
-
-void test_pcep_msg_create_close()
+void test_pcep_msg_create_close(void)
 {
 	uint8_t reason = PCEP_CLOSE_REASON_UNREC_MSG;
 
@@ -301,8 +296,7 @@ void test_pcep_msg_create_close()
 	pcep_msg_free_message(message);
 }
 
-
-void test_pcep_msg_create_error()
+void test_pcep_msg_create_error(void)
 {
 	uint8_t error_type = PCEP_ERRT_RECEPTION_OF_INV_OBJECT;
 	uint8_t error_value = PCEP_ERRV_KEEPALIVEWAIT_TIMED_OUT;
@@ -337,8 +331,7 @@ void test_pcep_msg_create_error()
 	pcep_msg_free_message(message);
 }
 
-
-void test_pcep_msg_create_keepalive()
+void test_pcep_msg_create_keepalive(void)
 {
 	struct pcep_message *message = pcep_msg_create_keepalive();
 	CU_ASSERT_PTR_NOT_NULL(message);
@@ -356,7 +349,7 @@ void test_pcep_msg_create_keepalive()
 	pcep_msg_free_message(message);
 }
 
-void test_pcep_msg_create_report()
+void test_pcep_msg_create_report(void)
 {
 	double_linked_list *obj_list = dll_initialize();
 
@@ -387,7 +380,7 @@ void test_pcep_msg_create_report()
 	pcep_msg_free_message(message);
 }
 
-void test_pcep_msg_create_update()
+void test_pcep_msg_create_update(void)
 {
 	double_linked_list *obj_list = dll_initialize();
 	double_linked_list *ero_subobj_list = dll_initialize();
@@ -439,7 +432,7 @@ void test_pcep_msg_create_update()
 	pcep_msg_free_message(message);
 }
 
-void test_pcep_msg_create_initiate()
+void test_pcep_msg_create_initiate(void)
 {
 	double_linked_list *obj_list = dll_initialize();
 	double_linked_list *ero_subobj_list = dll_initialize();

diff --git a/pceplib/test/pcep_msg_object_error_types_test.c b/pceplib/test/pcep_msg_object_error_types_test.c
@@ -44,7 +44,7 @@ void pcep_object_error_types_test_teardown(void)
 {
 }
 
-void test_get_error_type_str()
+void test_get_error_type_str(void)
 {
 	const char *error_type_str;
 	int i = 0;
@@ -57,7 +57,7 @@ void test_get_error_type_str()
 	CU_ASSERT_PTR_NULL(get_error_type_str(MAX_ERROR_TYPE));
 }
 
-void test_get_error_value_str()
+void test_get_error_value_str(void)
 {
 	const char *error_value_str;
 	int i = 0, j = 0;