From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Thu, 23 Jul 2020 10:01:46 +0000 (+0200)
Subject: resolve gcc 10 warnings
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~4^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=afd67e1e427193c56db4436ff9b5116ec718d0e3;p=siridb-server.git

resolve gcc 10 warnings
---

diff --git a/include/siri/db/time.h b/include/siri/db/time.h
index 151bd021..eee80ea1 100644
--- a/include/siri/db/time.h
+++ b/include/siri/db/time.h
@@ -21,7 +21,7 @@ typedef struct siridb_time_s siridb_time_t;
 #include <stddef.h>
 #include <time.h>
 
-const char * siridb_time_short_map[SIRIDB_TIME_END];
+static const char * SIRIDB_TIME_SHORT_MAP[SIRIDB_TIME_END] = {"s", "ms", "us", "ns"};
 siridb_time_t * siridb_time_new(siridb_timep_t precision);
 uint32_t siridb_time_in_seconds(siridb_t * siridb, int64_t ts);
 uint64_t siridb_time_now(siridb_t * siridb, struct timespec now);
@@ -40,4 +40,9 @@ static inline int siridb_int64_valid_ts(siridb_time_t * time, int64_t ts)
          ts >= 0 && ts < 4294967296 : ts >= 0;
 }
 
+static inline const char * siridb_time_short_map(siridb_timep_t tp)
+{
+    return SIRIDB_TIME_SHORT_MAP[tp];
+}
+
 #endif  /* SIRIDB_TIME_H_ */
diff --git a/include/siri/net/tcp.h b/include/siri/net/tcp.h
index ce13dcfd..71cf9e85 100644
--- a/include/siri/net/tcp.h
+++ b/include/siri/net/tcp.h
@@ -14,7 +14,9 @@ enum
     IP_SUPPORT_IPV6ONLY
 };
 
-int dns_req_family_map[3];
+/* dns_req_family_map maps to IP_SUPPORT values defined in socket.h */
+static int DNS_REQ_FAMILY_MAP[3] = {AF_UNSPEC, AF_INET, AF_INET6};
+
 const char * sirinet_tcp_ip_support_str(uint8_t ip_support);
 char * sirinet_tcp_name(uv_tcp_t * client);
 int sirinet_extract_addr_port(
@@ -22,4 +24,9 @@ int sirinet_extract_addr_port(
         char * addr,
         uint16_t * port);
 
+static inline int dns_req_family_map(int i)
+{
+    return DNS_REQ_FAMILY_MAP[i];
+}
+
 #endif  /* SIRINET_TCP_H_ */
diff --git a/src/siri/db/props.c b/src/siri/db/props.c
index 02cee86f..2e57bb22 100644
--- a/src/siri/db/props.c
+++ b/src/siri/db/props.c
@@ -578,7 +578,7 @@ static void prop_time_precision(
     assert (siridb->time->precision >= SIRIDB_TIME_SECONDS &&
             siridb->time->precision <= SIRIDB_TIME_NANOSECONDS);
 
-    qp_add_string(packer, siridb_time_short_map[siridb->time->precision]);
+    qp_add_string(packer, siridb_time_short_map(siridb->time->precision));
 }
 
 static void prop_uptime(
diff --git a/src/siri/db/server.c b/src/siri/db/server.c
index dc756783..54af4956 100644
--- a/src/siri/db/server.c
+++ b/src/siri/db/server.c
@@ -451,7 +451,7 @@ void siridb_server_connect(siridb_t * siridb, siridb_server_t * server)
             /* Try DNS */
             if (SERVER_resolve_dns(
                     server,
-                    dns_req_family_map[siri.cfg->ip_support],
+                    dns_req_family_map(siri.cfg->ip_support),
                     SERVER_on_resolved))
             {
                 sirinet_stream_decref(server->client);
diff --git a/src/siri/db/shard.c b/src/siri/db/shard.c
index 87dbe11f..1cfa1878 100644
--- a/src/siri/db/shard.c
+++ b/src/siri/db/shard.c
@@ -222,8 +222,8 @@ int siridb_shard_load(siridb_t * siridb, uint64_t id)
         log_critical(
                 "Time precision from shard (%s) is not the same as "
                 "database (%c). Skip loading '%c'",
-                siridb_time_short_map[time_precision],
-                siridb_time_short_map[siridb->time->precision],
+                siridb_time_short_map(time_precision),
+                siridb_time_short_map(siridb->time->precision),
                 shard->fn);
         siridb_shard_decref(shard);
         return -1;
diff --git a/src/siri/db/time.c b/src/siri/db/time.c
index 1d9f6f3c..fb4f26da 100644
--- a/src/siri/db/time.c
+++ b/src/siri/db/time.c
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <xmath/xmath.h>
 
-const char * siridb_time_short_map[] = {"s", "ms", "us", "ns"};
 
 /*
  * Returns NULL and raises a SIGNAL in case an error has occurred.
diff --git a/src/siri/net/tcp.c b/src/siri/net/tcp.c
index b09afe44..76ce0bee 100644
--- a/src/siri/net/tcp.c
+++ b/src/siri/net/tcp.c
@@ -12,9 +12,6 @@
 
 #define TCP_NAME_BUF_SZ 54
 
-/* dns_req_family_map maps to IP_SUPPORT values defined in socket.h */
-int dns_req_family_map[3] = {AF_UNSPEC, AF_INET, AF_INET6};
-
 const char * sirinet_tcp_ip_support_str(uint8_t ip_support)
 {
     switch (ip_support)
diff --git a/src/siri/service/client.c b/src/siri/service/client.c
index 0ffc9e83..1eb4fb20 100644
--- a/src/siri/service/client.c
+++ b/src/siri/service/client.c
@@ -205,7 +205,7 @@ int siri_service_client_request(
     {
         if (CLIENT_resolve_dns(
                 adm_client,
-                dns_req_family_map[siri.cfg->ip_support],
+                dns_req_family_map(siri.cfg->ip_support),
                 err_msg))
         {
             sirinet_stream_decref(siri.client);