From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Thu, 6 Jul 2023 17:40:10 +0000 (-0600)
Subject: cgcc review
X-Git-Tag: 1.6.0~72^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4cad721aaf9f5fd75340e0d28429949570b58af;p=thirdparty%2FFORT-validator.git

cgcc review
---

diff --git a/src/internal_pool.c b/src/internal_pool.c
index 3a5d3bef..09e36f27 100644
--- a/src/internal_pool.c
+++ b/src/internal_pool.c
@@ -12,7 +12,7 @@
 
 #define INTERNAL_POOL_MAX 10
 
-struct thread_pool *pool;
+static struct thread_pool *pool;
 
 int
 internal_pool_init(void)
diff --git a/src/log.c b/src/log.c
index 03e7c1a1..264b27a9 100644
--- a/src/log.c
+++ b/src/log.c
@@ -66,7 +66,7 @@ static pthread_mutex_t logck;
  * aware that pthread_mutex_lock() can return error codes, which shouldn't
  * prevent critical stack traces from printing.)
  */
-void
+static void
 print_stack_trace(char const *title)
 {
 #ifdef BACKTRACE_ENABLED
@@ -409,7 +409,7 @@ __vfprintf(int level, struct log_config *cfg, char const *format, va_list args)
 	if (cfg->color)
 		fprintf(lvl->stream, "%s", lvl->color);
 
-	now = time(0);
+	now = time(NULL);
 	if (now != ((time_t) -1)) {
 		localtime_r(&now, &stm_buff);
 		strftime(time_buff, sizeof(time_buff), "%b %e %T", &stm_buff);
diff --git a/src/object/tal.c b/src/object/tal.c
index 292d3fd1..a75991e4 100644
--- a/src/object/tal.c
+++ b/src/object/tal.c
@@ -369,7 +369,7 @@ tal_destroy(struct tal *tal)
 	free(tal);
 }
 
-int
+static int
 foreach_uri(struct tal *tal, foreach_uri_cb cb, void *arg)
 {
 	unsigned int i;
diff --git a/src/rtr/pdu.h b/src/rtr/pdu.h
index 281b8d2f..1c7d7630 100644
--- a/src/rtr/pdu.h
+++ b/src/rtr/pdu.h
@@ -47,8 +47,6 @@ char const *pdutype2str(enum pdu_type);
 #define RTRPDU_HDR_LEN			8
 
 #define RTRPDU_SERIAL_NOTIFY_LEN	12
-#define RTRPDU_SERIAL_QUERY_LEN		12
-#define RTRPDU_RESET_QUERY_LEN		8
 #define RTRPDU_CACHE_RESPONSE_LEN	8
 #define RTRPDU_IPV4_PREFIX_LEN		20
 #define RTRPDU_IPV6_PREFIX_LEN		32
diff --git a/src/rtr/pdu_sender.c b/src/rtr/pdu_sender.c
index e722b763..ed0c6215 100644
--- a/src/rtr/pdu_sender.c
+++ b/src/rtr/pdu_sender.c
@@ -235,30 +235,32 @@ send_router_key_pdu(int fd, uint8_t version,
 	return send_response(fd, pdu.header.pdu_type, data, len);
 }
 
-#define GET_END_OF_DATA_LENGTH(version)					\
-	((version == RTR_V1) ?						\
-	    RTRPDU_END_OF_DATA_V1_LEN : RTRPDU_END_OF_DATA_V0_LEN)
+#define MAX(a, b) ((a > b) ? a : b)
 
 int
 send_end_of_data_pdu(int fd, uint8_t version, serial_t end_serial)
 {
 	struct end_of_data_pdu pdu;
-	unsigned char data[GET_END_OF_DATA_LENGTH(version)];
+	unsigned char data[MAX(
+	    RTRPDU_END_OF_DATA_V1_LEN, RTRPDU_END_OF_DATA_V0_LEN
+	)];
 	size_t len;
 
 	set_header_values(&pdu.header, version, PDU_TYPE_END_OF_DATA,
 	    get_current_session_id(version));
-	pdu.header.length = GET_END_OF_DATA_LENGTH(version);
 
 	pdu.serial_number = end_serial;
 	if (version == RTR_V1) {
+		pdu.header.length = RTRPDU_END_OF_DATA_V1_LEN;
 		pdu.refresh_interval = config_get_interval_refresh();
 		pdu.retry_interval = config_get_interval_retry();
 		pdu.expire_interval = config_get_interval_expire();
+	} else {
+		pdu.header.length = RTRPDU_END_OF_DATA_V0_LEN;
 	}
 
 	len = serialize_end_of_data_pdu(&pdu, data);
-	if (len != GET_END_OF_DATA_LENGTH(version))
+	if (len != pdu.header.length)
 		pr_crit("Serialized End of Data is %zu bytes.", len);
 
 	return send_response(fd, pdu.header.pdu_type, data, len);
diff --git a/src/rtr/pdu_serializer.c b/src/rtr/pdu_serializer.c
index e80bf02a..1ad7a77f 100644
--- a/src/rtr/pdu_serializer.c
+++ b/src/rtr/pdu_serializer.c
@@ -5,7 +5,7 @@
 #include "primitive_writer.h"
 
 static size_t
-serialize_pdu_header(struct pdu_header *header, uint16_t union_value,
+serialize_pdu_header(struct pdu_header const *header, uint16_t union_value,
     unsigned char *buf)
 {
 	unsigned char *ptr;
@@ -84,7 +84,7 @@ serialize_ipv6_prefix_pdu(struct ipv6_prefix_pdu *pdu, unsigned char *buf)
 }
 
 size_t
-serialize_end_of_data_pdu(struct end_of_data_pdu *pdu, unsigned char *buf)
+serialize_end_of_data_pdu(struct end_of_data_pdu const *pdu, unsigned char *buf)
 {
 	size_t head_size;
 	unsigned char *ptr;
diff --git a/src/rtr/pdu_serializer.h b/src/rtr/pdu_serializer.h
index 45f1107a..6b157a5d 100644
--- a/src/rtr/pdu_serializer.h
+++ b/src/rtr/pdu_serializer.h
@@ -9,7 +9,8 @@ size_t serialize_cache_response_pdu(struct cache_response_pdu *,
     unsigned char *);
 size_t serialize_ipv4_prefix_pdu(struct ipv4_prefix_pdu *, unsigned char *);
 size_t serialize_ipv6_prefix_pdu(struct ipv6_prefix_pdu *, unsigned char *);
-size_t serialize_end_of_data_pdu(struct end_of_data_pdu *, unsigned char *);
+size_t serialize_end_of_data_pdu(struct end_of_data_pdu const *,
+    unsigned char *);
 size_t serialize_cache_reset_pdu(struct cache_reset_pdu *, unsigned char *);
 size_t serialize_router_key_pdu(struct router_key_pdu *, unsigned char *);
 size_t serialize_error_report_pdu(struct error_report_pdu *, unsigned char *);
diff --git a/src/rtr/rtr.c b/src/rtr/rtr.c
index 7784ad2f..d69c7f70 100644
--- a/src/rtr/rtr.c
+++ b/src/rtr/rtr.c
@@ -29,7 +29,7 @@ static struct server_arraylist servers;
 static struct client_arraylist clients;
 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 
-struct thread_pool *request_handlers;
+static struct thread_pool *request_handlers;
 
 #define REQUEST_BUFFER_LEN 1024