[C] Fix compiler warnings. real-logic#887.

mikeb01 · Mar 13, 2020 · 751870a · 751870a
1 parent 08c8601
commit 751870a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/aeron-driver/src/main/c/aeron_name_resolver_driver.c b/aeron-driver/src/main/c/aeron_name_resolver_driver.c
@@ -41,6 +41,17 @@
 #define AERON_NAME_RESOLVER_DRIVER_DUTY_CYCLE_MS (10)
 #define AERON_NAME_RESOLVER_DRIVER_NUM_RECV_BUFFERS (1)
 
+
+static inline size_t aeron_res_header_entry_length_ipv4(aeron_resolution_header_ipv4_t *header)
+{
+    return AERON_ALIGN(sizeof(aeron_resolution_header_ipv4_t) + header->name_length, sizeof(int64_t));
+}
+
+static inline size_t aeron_res_header_entry_length_ipv6(aeron_resolution_header_ipv6_t *header)
+{
+    return AERON_ALIGN(sizeof(aeron_resolution_header_ipv6_t) + header->name_length, sizeof(int64_t));
+}
+
 typedef struct aeron_name_resolver_driver_neighbor_stct
 {
     uint8_t address[AERON_RES_HEADER_ADDRESS_LENGTH_IP6];
@@ -85,7 +96,7 @@ aeron_name_resolver_driver_t;
 
 static const char *host_string(struct sockaddr_storage *addr)
 {
-    static char buf[1024];
+    static char buf[NI_MAXHOST + NI_MAXSERV + 32];
     char host[NI_MAXHOST];
     char port[NI_MAXSERV];
 

diff --git a/aeron-driver/src/main/c/protocol/aeron_udp_protocol.c b/aeron-driver/src/main/c/protocol/aeron_udp_protocol.c
@@ -42,6 +42,4 @@ int aeron_udp_protocol_group_tag(aeron_status_message_header_t *sm, int64_t *gro
 }
 
 extern size_t aeron_res_header_address_length(int8_t res_type);
-extern size_t aeron_res_header_entry_length_ipv4(aeron_resolution_header_ipv4_t *header);
-extern size_t aeron_res_header_entry_length_ipv6(aeron_resolution_header_ipv6_t *header);
 
diff --git a/aeron-driver/src/main/c/protocol/aeron_udp_protocol.h b/aeron-driver/src/main/c/protocol/aeron_udp_protocol.h
@@ -164,14 +164,4 @@ inline size_t aeron_res_header_address_length(int8_t res_type)
         AERON_RES_HEADER_ADDRESS_LENGTH_IP6 : AERON_RES_HEADER_ADDRESS_LENGTH_IP4;
 }
 
-inline size_t aeron_res_header_entry_length_ipv4(aeron_resolution_header_ipv4_t *header)
-{
-    return AERON_ALIGN(sizeof(aeron_resolution_header_ipv4_t) + header->name_length, sizeof(int64_t));
-}
-
-inline size_t aeron_res_header_entry_length_ipv6(aeron_resolution_header_ipv6_t *header)
-{
-    return AERON_ALIGN(sizeof(aeron_resolution_header_ipv6_t) + header->name_length, sizeof(int64_t));
-}
-
 #endif //AERON_UDP_PROTOCOL_H
diff --git a/aeron-driver/src/test/c/aeron_name_resolver_test.cpp b/aeron-driver/src/test/c/aeron_name_resolver_test.cpp
@@ -171,9 +171,6 @@ TEST_F(NameResolverTest, shouldSeeNeighborFromBootstrap)
 
 TEST_F(NameResolverTest, shouldSeeNeighborFromGossip)
 {
-    struct in_addr local_address_b;
-    inet_pton(AF_INET, "127.0.0.1", &local_address_b);
-
     aeron_name_resolver_supplier_func_t supplier_func = aeron_name_resolver_supplier_load(AERON_NAME_RESOLVER_DRIVER);
     ASSERT_NE(nullptr, supplier_func);
 
@@ -201,19 +198,13 @@ TEST_F(NameResolverTest, shouldSeeNeighborFromGossip)
     aeron_driver_context_set_resolver_bootstrap_neighbor(m_context_c, "localhost:8051");
     ASSERT_EQ(0, supplier_func(m_context_c, &resolver_c, NULL));
 
-    aeron_clock_update_cached_time(m_context_a->cached_clock, timestamp_ms, timestamp_ms * 1000000);
-    aeron_clock_update_cached_time(m_context_b->cached_clock, timestamp_ms, timestamp_ms * 1000000);
-    aeron_clock_update_cached_time(m_context_c->cached_clock, timestamp_ms, timestamp_ms * 1000000);
-
     for (int i = 0; i < 6; i++)
     {
         timestamp_ms += 1000;
+        aeron_clock_update_cached_time(m_context_a->cached_clock, timestamp_ms, timestamp_ms * 1000000);
+        aeron_clock_update_cached_time(m_context_b->cached_clock, timestamp_ms, timestamp_ms * 1000000);
+        aeron_clock_update_cached_time(m_context_c->cached_clock, timestamp_ms, timestamp_ms * 1000000);
 
-//        ASSERT_LT(0, resolver_c.do_work_func(&resolver_c, timestamp_ms));
-//
-//        ASSERT_LT(0, resolver_b.do_work_func(&resolver_b, timestamp_ms));
-//
-//        ASSERT_LT(0, resolver_a.do_work_func(&resolver_a, timestamp_ms));
         resolver_a.do_work_func(&resolver_a, timestamp_ms);
         resolver_b.do_work_func(&resolver_b, timestamp_ms);
         resolver_c.do_work_func(&resolver_c, timestamp_ms);