From 2816045a6edf64db6c5018db54a33aa4f66fca58 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 25 Oct 2022 20:04:43 -0400 Subject: [PATCH 1/6] pceplib: Fix clang-16 not happy with build In this case it was functions without a prototype Signed-off-by: Donald Sharp --- pceplib/pcep_msg_messages.c | 2 +- pceplib/pcep_msg_messages_encoding.c | 2 +- pceplib/pcep_pcc.c | 4 +--- pceplib/pcep_pcc_api.c | 14 +++++++------- pceplib/pcep_session_logic.c | 6 +++--- pceplib/pcep_socket_comm.c | 6 +++--- pceplib/pcep_timers.c | 4 ++-- pceplib/pcep_utils_double_linked_list.c | 2 +- pceplib/pcep_utils_logging.c | 2 +- pceplib/pcep_utils_memory.c | 4 ++-- pceplib/pcep_utils_queue.c | 2 +- 11 files changed, 23 insertions(+), 25 deletions(-) diff --git a/pceplib/pcep_msg_messages.c b/pceplib/pcep_msg_messages.c index 9bbfc5372b..5a244098d4 100644 --- a/pceplib/pcep_msg_messages.c +++ b/pceplib/pcep_msg_messages.c @@ -163,7 +163,7 @@ pcep_msg_create_error_with_objects(uint8_t error_type, uint8_t error_value, return message; } -struct pcep_message *pcep_msg_create_keepalive() +struct pcep_message *pcep_msg_create_keepalive(void) { return (pcep_msg_create_common(PCEP_TYPE_KEEPALIVE)); } diff --git a/pceplib/pcep_msg_messages_encoding.c b/pceplib/pcep_msg_messages_encoding.c index e90ca1cfd8..2d27e40407 100644 --- a/pceplib/pcep_msg_messages_encoding.c +++ b/pceplib/pcep_msg_messages_encoding.c @@ -348,7 +348,7 @@ struct pcep_message *pcep_decode_message(const uint8_t *msg_buf) return msg; } -struct pcep_versioning *create_default_pcep_versioning() +struct pcep_versioning *create_default_pcep_versioning(void) { struct pcep_versioning *versioning = pceplib_malloc(PCEPLIB_INFRA, sizeof(struct pcep_versioning)); diff --git a/pceplib/pcep_pcc.c b/pceplib/pcep_pcc.c index 18ccf250ae..47e357729c 100644 --- a/pceplib/pcep_pcc.c +++ b/pceplib/pcep_pcc.c @@ -74,7 +74,6 @@ static const short DEFAULT_SRC_TCP_PORT = 4999; // Private fn's struct cmd_line_args *get_cmdline_args(int argc, char *argv[]); void handle_signal_action(int sig_number); -int setup_signals(void); void send_pce_path_request_message(pcep_session *session); void send_pce_report_message(pcep_session *session); void print_queue_event(struct pcep_event *event); @@ -211,8 +210,7 @@ void handle_signal_action(int sig_number) } } - -int setup_signals() +static int setup_signals(void) { struct sigaction sa; memset(&sa, 0, sizeof(sa)); diff --git a/pceplib/pcep_pcc_api.c b/pceplib/pcep_pcc_api.c index b7813c5a05..75c2b59b66 100644 --- a/pceplib/pcep_pcc_api.c +++ b/pceplib/pcep_pcc_api.c @@ -55,7 +55,7 @@ const char UNKNOWN_EVENT_STR[] = "UNKNOWN Event Type"; /* Session Logic Handle managed in pcep_session_logic.c */ extern pcep_event_queue *session_logic_event_queue_; -bool initialize_pcc() +bool initialize_pcc(void) { if (!run_session_logic()) { pcep_log(LOG_ERR, "%s: Error initializing PCC session logic.", @@ -85,13 +85,13 @@ bool initialize_pcc_infra(struct pceplib_infra_config *infra_config) /* this function is blocking */ -bool initialize_pcc_wait_for_completion() +bool initialize_pcc_wait_for_completion(void) { return run_session_logic_wait_for_completion(); } -bool destroy_pcc() +bool destroy_pcc(void) { if (!stop_session_logic()) { pcep_log(LOG_WARNING, "%s: Error stopping PCC session logic.", @@ -103,7 +103,7 @@ bool destroy_pcc() } -pcep_configuration *create_default_pcep_configuration() +pcep_configuration *create_default_pcep_configuration(void) { pcep_configuration *config = pceplib_malloc(PCEPLIB_INFRA, sizeof(pcep_configuration)); @@ -226,7 +226,7 @@ void send_message(pcep_session *session, struct pcep_message *msg, } /* Returns true if the queue is empty, false otherwise */ -bool event_queue_is_empty() +bool event_queue_is_empty(void) { if (session_logic_event_queue_ == NULL) { pcep_log( @@ -246,7 +246,7 @@ bool event_queue_is_empty() /* Return the number of events on the queue, 0 if empty */ -uint32_t event_queue_num_events_available() +uint32_t event_queue_num_events_available(void) { if (session_logic_event_queue_ == NULL) { pcep_log( @@ -266,7 +266,7 @@ uint32_t event_queue_num_events_available() /* Return the next event on the queue, NULL if empty */ -struct pcep_event *event_queue_get_event() +struct pcep_event *event_queue_get_event(void) { if (session_logic_event_queue_ == NULL) { pcep_log( diff --git a/pceplib/pcep_session_logic.c b/pceplib/pcep_session_logic.c index 78d1072552..02cf3bffbd 100644 --- a/pceplib/pcep_session_logic.c +++ b/pceplib/pcep_session_logic.c @@ -111,7 +111,7 @@ static bool run_session_logic_common(void) } -bool run_session_logic() +bool run_session_logic(void) { if (!run_session_logic_common()) { return false; @@ -234,7 +234,7 @@ bool run_session_logic_with_infra(pceplib_infra_config *infra_config) return true; } -bool run_session_logic_wait_for_completion() +bool run_session_logic_wait_for_completion(void) { if (!run_session_logic()) { return false; @@ -247,7 +247,7 @@ bool run_session_logic_wait_for_completion() } -bool stop_session_logic() +bool stop_session_logic(void) { if (session_logic_handle_ == NULL) { pcep_log(LOG_WARNING, "%s: Session logic already stopped", diff --git a/pceplib/pcep_socket_comm.c b/pceplib/pcep_socket_comm.c index e22eb6e675..4a97c84891 100644 --- a/pceplib/pcep_socket_comm.c +++ b/pceplib/pcep_socket_comm.c @@ -62,7 +62,7 @@ int socket_fd_node_compare(void *list_entry, void *new_entry) } -bool initialize_socket_comm_pre() +bool initialize_socket_comm_pre(void) { socket_comm_handle_ = pceplib_malloc(PCEPLIB_INFRA, sizeof(pcep_socket_comm_handle)); @@ -129,7 +129,7 @@ bool initialize_socket_comm_external_infra( return true; } -bool initialize_socket_comm_loop() +bool initialize_socket_comm_loop(void) { if (socket_comm_handle_ != NULL) { /* already initialized */ @@ -152,7 +152,7 @@ bool initialize_socket_comm_loop() } -bool destroy_socket_comm_loop() +bool destroy_socket_comm_loop(void) { socket_comm_handle_->active = false; diff --git a/pceplib/pcep_timers.c b/pceplib/pcep_timers.c index b0f3e70b50..61fda16363 100644 --- a/pceplib/pcep_timers.c +++ b/pceplib/pcep_timers.c @@ -197,7 +197,7 @@ void free_all_timers(pcep_timers_context *timers_context) } -bool teardown_timers() +bool teardown_timers(void) { if (timers_context_ == NULL) { pcep_log( @@ -252,7 +252,7 @@ bool teardown_timers() } -int get_next_timer_id() +int get_next_timer_id(void) { if (timer_id_ == INT_MAX) { timer_id_ = 0; diff --git a/pceplib/pcep_utils_double_linked_list.c b/pceplib/pcep_utils_double_linked_list.c index 696e46632a..7f90df40f2 100644 --- a/pceplib/pcep_utils_double_linked_list.c +++ b/pceplib/pcep_utils_double_linked_list.c @@ -31,7 +31,7 @@ #include "pcep_utils_logging.h" #include "pcep_utils_memory.h" -double_linked_list *dll_initialize() +double_linked_list *dll_initialize(void) { double_linked_list *handle = pceplib_malloc(PCEPLIB_INFRA, sizeof(double_linked_list)); diff --git a/pceplib/pcep_utils_logging.c b/pceplib/pcep_utils_logging.c index 0286c23078..c9b2588b4b 100644 --- a/pceplib/pcep_utils_logging.c +++ b/pceplib/pcep_utils_logging.c @@ -45,7 +45,7 @@ void set_logging_level(int level) logging_level_ = level; } -int get_logging_level() +int get_logging_level(void) { return logging_level_; } diff --git a/pceplib/pcep_utils_memory.c b/pceplib/pcep_utils_memory.c index c564705f66..10856cac2a 100644 --- a/pceplib/pcep_utils_memory.c +++ b/pceplib/pcep_utils_memory.c @@ -75,7 +75,7 @@ bool pceplib_memory_initialize(void *pceplib_infra_mt, return true; } -void pceplib_memory_reset() +void pceplib_memory_reset(void) { pceplib_infra_mt.total_bytes_allocated = 0; pceplib_infra_mt.num_allocates = 0; @@ -88,7 +88,7 @@ void pceplib_memory_reset() pceplib_messages_mt.num_frees = 0; } -void pceplib_memory_dump() +void pceplib_memory_dump(void) { if (PCEPLIB_INFRA) { pcep_log( diff --git a/pceplib/pcep_utils_queue.c b/pceplib/pcep_utils_queue.c index 627533d01b..22e417111f 100644 --- a/pceplib/pcep_utils_queue.c +++ b/pceplib/pcep_utils_queue.c @@ -33,7 +33,7 @@ #include "pcep_utils_memory.h" #include "pcep_utils_queue.h" -queue_handle *queue_initialize() +queue_handle *queue_initialize(void) { /* Set the max_entries to 0 to disable it */ return queue_initialize_with_size(0); From 103372fd75d4bda27c6e87cdc7146d4060d6d873 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 25 Oct 2022 20:06:49 -0400 Subject: [PATCH 2/6] isisd: Make clang-16 compiler happy with isisd Signed-off-by: Donald Sharp --- isisd/isisd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/isisd/isisd.c b/isisd/isisd.c index efea1e5d5e..17f4b20737 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -723,7 +723,7 @@ void isis_vrf_init(void) vrf_cmd_init(NULL); } -void isis_terminate() +void isis_terminate(void) { struct isis *isis; struct listnode *node, *nnode; @@ -2745,7 +2745,6 @@ static void show_isis_database_json(struct json_object *json, const char *sysid_ struct isis_area *area; int level; struct json_object *tag_area_json,*area_json, *lsp_json, *area_arr_json, *arr_json; - uint8_t area_cnt = 0; if (isis->area_list->count == 0) return; @@ -2770,7 +2769,6 @@ static void show_isis_database_json(struct json_object *json, const char *sysid_ json_object_array_add(arr_json, lsp_json); } json_object_array_add(area_arr_json, area_json); - area_cnt++; } } @@ -3232,7 +3230,7 @@ void isis_area_overload_on_startup_set(struct isis_area *area, * Returns the path of the file (non-volatile memory) that contains restart * information. */ -char *isis_restart_filepath() +char *isis_restart_filepath(void) { static char filepath[MAXPATHLEN]; snprintf(filepath, sizeof(filepath), ISISD_RESTART, ""); From d038abcc2594b10e70f4cebc5e257cb119887cb8 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 26 Oct 2022 07:39:14 -0400 Subject: [PATCH 3/6] pathd: Make pathd happy with clang-16 Signed-off-by: Donald Sharp --- pathd/path_ted.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pathd/path_ted.c b/pathd/path_ted.c index 316255a97e..bb04d285c9 100644 --- a/pathd/path_ted.c +++ b/pathd/path_ted.c @@ -162,7 +162,7 @@ bool path_ted_is_initialized(void) * * @return Ptr to ted or NULL */ -struct ls_ted *path_ted_create_ted() +struct ls_ted *path_ted_create_ted(void) { struct ls_ted *ted = ls_ted_new(TED_KEY, TED_NAME, TED_ASN); From 00fb4b9dcdbfffc770eff7fcea5aee131780e5f1 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 26 Oct 2022 07:39:47 -0400 Subject: [PATCH 4/6] pimd: Make pimd happy with clang-16 Signed-off-by: Donald Sharp --- pimd/pim_vty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 9021f1e12f..553c1314d2 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -401,7 +401,7 @@ static int gm_config_write(struct vty *vty, int writes, vty_out(vty, " ipv6 mld last-member-query-interval %d\n", pim_ifp->gm_specific_query_max_response_time_dsec); - return 0; + return writes; } #endif From 3ca6d7300ba9b31b00a616d6e127feb3a3febce1 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 26 Oct 2022 07:40:48 -0400 Subject: [PATCH 5/6] ldpd: Make ldpd happy with clang-16 Signed-off-by: Donald Sharp --- ldpd/neighbor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c index e1db9e8e1e..6d6c7d00cd 100644 --- a/ldpd/neighbor.c +++ b/ldpd/neighbor.c @@ -359,8 +359,7 @@ nbr_find_ldpid(uint32_t lsr_id) return (RB_FIND(nbr_id_head, &nbrs_by_id, &n)); } -struct nbr * -nbr_get_first_ldpid() +struct nbr *nbr_get_first_ldpid(void) { return (RB_MIN(nbr_id_head, &nbrs_by_id)); } From b6ce3356d93f247cb000bb379df2a6a49a526df6 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 26 Oct 2022 07:41:03 -0400 Subject: [PATCH 6/6] ospf6d: Make ospf6d happy with clang-16 Signed-off-by: Donald Sharp --- ospf6d/ospf6_route.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index 8e964393f1..fab0479d42 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -1360,7 +1360,7 @@ static void ospf6_route_show_table_summary(struct vty *vty, struct ospf6_route *route, *prev = NULL; int i, pathtype[OSPF6_PATH_TYPE_MAX]; unsigned int number = 0; - int nh_count = 0, nhinval = 0, ecmp = 0; + int nh_count = 0, ecmp = 0; int alternative = 0, destination = 0; char path_str[30]; @@ -1374,9 +1374,7 @@ static void ospf6_route_show_table_summary(struct vty *vty, else alternative++; nh_count = ospf6_num_nexthops(route->nh_list); - if (!nh_count) - nhinval++; - else if (nh_count > 1) + if (nh_count > 1) ecmp++; pathtype[route->path.type]++; number++;