cgcc review

diff --git a/src/internal_pool.c b/src/internal_pool.c
index 3a5d3bef76c0e85ebbf4f9f825ef19b3b5fc0906..09e36f279e6b6f7143fc5a1ac1ffbf5e069b304b 100644 (file)
--- 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 03e7c1a1af13be24a7cbba9a0f8b16ac0d945204..264b27a978b7c3b1045876d609479d64941e352d 100644 (file)
--- 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 292d3fd15dbc6bf73f9be9cbabc7f18ccc685044..a75991e4e1ce0a517e80429338e52a41724874b7 100644 (file)
--- 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 281b8d2fb9c34db74d77920d519a767ac8c9ca7a..1c7d76308237bb571a2fd2c149eefa4507f0d212 100644 (file)
--- 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 e722b763fa91cd684544424c94599d1326966b1d..ed0c6215d2d24f1d059ddaf5740b9978b8d30e2c 100644 (file)
--- 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 e80bf02a73f1163907f5d3a52f4db45873fc8d84..1ad7a77f9a03003bc0c433c57425a3a4a138f316 100644 (file)
--- 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 45f1107a272f823b48f6586c97cb3a4bcbaec0c9..6b157a5d4b8f60fdb9b8445b926ab1d486b34d19 100644 (file)
--- 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 7784ad2f0c4258af7889beebc0f19c726d80117d..d69c7f701d0006bd2d36b854add0e540f53d7201 100644 (file)
--- 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