From c603fdd4ed5f01d541ffa9d4c02f6d1c07f39fbd Mon Sep 17 00:00:00 2001
From: Erik Boasson <eb@ilities.com>
Date: Fri, 15 Nov 2019 11:49:36 +0100
Subject: [PATCH] Fix trivial white space, compiler warnings

Signed-off-by: Erik Boasson <eb@ilities.com>
---
 src/ddsrt/include/dds/ddsrt/bswap.h | 3 ++-
 src/tools/pubsub/pubsub.c           | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ddsrt/include/dds/ddsrt/bswap.h b/src/ddsrt/include/dds/ddsrt/bswap.h
index 3e1ff56..953b1ac 100644
--- a/src/ddsrt/include/dds/ddsrt/bswap.h
+++ b/src/ddsrt/include/dds/ddsrt/bswap.h
@@ -84,4 +84,5 @@ inline int64_t ddsrt_bswap8 (int64_t x)
 }
 #endif
 
-#endif /* DDSRT_BSWAP_H */
\ No newline at end of file
+#endif /* DDSRT_BSWAP_H */
+
diff --git a/src/tools/pubsub/pubsub.c b/src/tools/pubsub/pubsub.c
index b810d24..434f564 100644
--- a/src/tools/pubsub/pubsub.c
+++ b/src/tools/pubsub/pubsub.c
@@ -292,7 +292,7 @@ static char *expand_env(const char *name, char op, const char *alt) {
         else {
             char *altx = expand_envvars(alt);
             error_exit("%s: %s\n", name, altx);
-            dds_free(altx);
+            //dds_free(altx);
             return NULL;
         }
     case '+':
@@ -2103,6 +2103,7 @@ static int get_metadata(char **metadata, char **typename, char **keylist, const
     return 1;
 }
 
+#if 0
 static dds_entity_t find_topic(dds_entity_t dpFindTopic, const char *name, const dds_duration_t *timeout) {
     dds_entity_t tp;
     (void)timeout;
@@ -2157,6 +2158,7 @@ static dds_entity_t find_topic(dds_entity_t dpFindTopic, const char *name, const
 
     return tp;
 }
+#endif
 
 static void set_systemid_env(void) {
 //    TODO Determine encoding of dds_instance_handle_t, and see what sort of value can be extracted from it, if any
@@ -2678,7 +2680,9 @@ int main(int argc, char *argv[]) {
         case OU:   spec[i].tp = new_topic(spec[i].topicname, ts_OneULong, qos); break;
         case ARB:
             // TODO ARB type support
+#if 1
             error_exit("Currently doesn't support ARB type\n");
+#else
             if (spec[i].metadata == NULL) {
                 if (!(spec[i].tp = find_topic(dp, spec[i].topicname, &spec[i].findtopic_timeout)))
                     error_exit("topic %s not found\n", spec[i].topicname);
@@ -2691,6 +2695,7 @@ int main(int argc, char *argv[]) {
 //                dds_topic_descriptor_delete((dds_topic_descriptor_t*) ts);
             }
 //            spec[i].rd.tgtp = spec[i].wr.tgtp = tgnew(spec[i].tp, printtype);
+#endif
             break;
         }
         assert(spec[i].tp);