From 14d47f0d7ad1ec0e1554b2cea4d013b837c77a47 Mon Sep 17 00:00:00 2001
From: mjpt777 <mjpt777@gmail.com>
Date: Fri, 26 Nov 2021 12:59:07 +0000
Subject: [PATCH] [C/C++] Warnings cleanup.

---
 aeron-driver/src/main/c/aeron_csv_table_name_resolver.c   | 3 +--
 aeron-driver/src/test/c/aeron_counters_manager_test.cpp   | 7 ++++++-
 aeron-driver/src/test/c/aeron_retransmit_handler_test.cpp | 4 +---
 aeron-samples/src/main/c/cpong.c                          | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/aeron-driver/src/main/c/aeron_csv_table_name_resolver.c b/aeron-driver/src/main/c/aeron_csv_table_name_resolver.c
index 6b825a3514..2e05f275f7 100644
--- a/aeron-driver/src/main/c/aeron_csv_table_name_resolver.c
+++ b/aeron-driver/src/main/c/aeron_csv_table_name_resolver.c
@@ -70,8 +70,7 @@ int aeron_csv_table_name_resolver_resolve(
 
                 if (AERON_NAME_RESOLVER_CSV_DISABLE_RESOLUTION_OP == operation)
                 {
-                    AERON_SET_ERR(
-                        -AERON_ERROR_CODE_UNKNOWN_HOST, "Unable to resolve host=(%s): (forced)", hostname);
+                    AERON_SET_ERR(-AERON_ERROR_CODE_UNKNOWN_HOST, "Unable to resolve host=(%s): (forced)", hostname);
                     return -1;
                 }
                 else if (AERON_NAME_RESOLVER_CSV_USE_INITIAL_RESOLUTION_HOST_OP == operation)
diff --git a/aeron-driver/src/test/c/aeron_counters_manager_test.cpp b/aeron-driver/src/test/c/aeron_counters_manager_test.cpp
index fee6b6f741..4453afc477 100755
--- a/aeron-driver/src/test/c/aeron_counters_manager_test.cpp
+++ b/aeron-driver/src/test/c/aeron_counters_manager_test.cpp
@@ -228,7 +228,12 @@ struct metadata_test_stct
 };
 
 void func_should_store_metadata(
-    int32_t id, int32_t type_id, const uint8_t *key, size_t key_length, const uint8_t *label, size_t label_length, void *clientd)
+    int32_t id, int32_t type_id,
+    const uint8_t *key,
+    size_t key_length,
+    const uint8_t *label,
+    size_t label_length,
+    void *clientd)
 {
     auto *info = reinterpret_cast<struct metadata_test_stct *>(clientd);
     static size_t times_called = 0;
diff --git a/aeron-driver/src/test/c/aeron_retransmit_handler_test.cpp b/aeron-driver/src/test/c/aeron_retransmit_handler_test.cpp
index 5e966c7e3a..107ecef9d9 100755
--- a/aeron-driver/src/test/c/aeron_retransmit_handler_test.cpp
+++ b/aeron-driver/src/test/c/aeron_retransmit_handler_test.cpp
@@ -39,9 +39,7 @@ extern "C"
 class RetransmitHandlerTest : public testing::Test
 {
 public:
-    RetransmitHandlerTest()
-    {
-    }
+    RetransmitHandlerTest() = default;
 
     ~RetransmitHandlerTest() override
     {
diff --git a/aeron-samples/src/main/c/cpong.c b/aeron-samples/src/main/c/cpong.c
index a45c4b8060..dac997d07e 100644
--- a/aeron-samples/src/main/c/cpong.c
+++ b/aeron-samples/src/main/c/cpong.c
@@ -117,13 +117,13 @@ int main(int argc, char **argv)
 
             case 'S':
             {
-                pong_stream_id = strtoul(optarg, NULL, 0);
+                pong_stream_id = (int32_t)strtoul(optarg, NULL, 0);
                 break;
             }
 
             case 's':
             {
-                ping_stream_id = strtoul(optarg, NULL, 0);
+                ping_stream_id = (int32_t)strtoul(optarg, NULL, 0);
                 break;
             }