From f099ff59ebec4adb9bdcbae02f81328419271166 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Tue, 1 Aug 2023 13:47:11 +0200
Subject: [PATCH] Rename T files to avoid name clashes

There is already common/utils/config.h. This file(name) is hardcoded as
it is included into asn1c, and cannot be renamed. To avoid a name clash
and confusing, we rename T's config.h/c to configuration.h/c.
---
 common/utils/T/tracer/CMakeLists.txt          |  2 +-
 common/utils/T/tracer/Makefile                | 24 +++++++++----------
 .../T/tracer/{config.c => configuration.c}    |  2 +-
 .../T/tracer/{config.h => configuration.h}    |  0
 common/utils/T/tracer/enb.c                   |  2 +-
 common/utils/T/tracer/event.c                 |  2 +-
 common/utils/T/tracer/extract.c               |  2 +-
 .../utils/T/tracer/extract_input_subframe.c   |  2 +-
 .../utils/T/tracer/extract_output_subframe.c  |  2 +-
 common/utils/T/tracer/gnb.c                   |  2 +-
 common/utils/T/tracer/hacks/Makefile          |  6 ++---
 common/utils/T/tracer/macpdu2wireshark.c      |  2 +-
 common/utils/T/tracer/multi.c                 |  2 +-
 common/utils/T/tracer/record.c                |  2 +-
 common/utils/T/tracer/textlog.c               |  2 +-
 common/utils/T/tracer/to_vcd.c                |  2 +-
 common/utils/T/tracer/ue.c                    |  2 +-
 common/utils/T/tracer/vcd.c                   |  2 +-
 18 files changed, 30 insertions(+), 30 deletions(-)
 rename common/utils/T/tracer/{config.c => configuration.c} (97%)
 rename common/utils/T/tracer/{config.h => configuration.h} (100%)

diff --git a/common/utils/T/tracer/CMakeLists.txt b/common/utils/T/tracer/CMakeLists.txt
index b60649d2d4..a587b00243 100644
--- a/common/utils/T/tracer/CMakeLists.txt
+++ b/common/utils/T/tracer/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(tracer_utils OBJECT config.c database.c event.c handler.c utils.c)
+add_library(tracer_utils OBJECT configuration.c database.c event.c handler.c utils.c)
 target_link_libraries(tracer_utils PUBLIC m pthread)
 
 add_library(tracer_events OBJECT event_selector.c)
diff --git a/common/utils/T/tracer/Makefile b/common/utils/T/tracer/Makefile
index 0713d9a3df..6ddf05e65b 100644
--- a/common/utils/T/tracer/Makefile
+++ b/common/utils/T/tracer/Makefile
@@ -10,7 +10,7 @@ all: record replay extract_config textlog enb ue vcd macpdu2wireshark \
      extract_input_subframe extract_output_subframe to_vcd extract multi \
      gnb
 
-record: utils.o record.o database.o config.o
+record: utils.o record.o database.o configuration.o
 	$(CC) $(CFLAGS) -o record $^ $(LIBS)
 
 replay: utils.o replay.o
@@ -20,48 +20,48 @@ extract_config: extract_config.o
 	$(CC) $(CFLAGS) -o extract_config $^ $(LIBS)
 
 extract_input_subframe: extract_input_subframe.o database.o event.o utils.o \
-    config.o
+    configuration.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
 extract_output_subframe: extract_output_subframe.o database.o event.o utils.o \
-    config.o
+    configuration.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
-extract: extract.o database.o event.o utils.o config.o
+extract: extract.o database.o event.o utils.o configuration.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
-textlog: utils.o textlog.o database.o event.o handler.o config.o \
+textlog: utils.o textlog.o database.o event.o handler.o configuration.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
 	$(CC) $(CFLAGS) -o textlog $^ $(LIBS) $(XLIBS)
 
-enb: utils.o enb.o database.o event.o handler.o config.o \
+enb: utils.o enb.o database.o event.o handler.o configuration.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
 	$(CC) $(CFLAGS) -o enb $^ $(LIBS) $(XLIBS)
 
-ue: utils.o ue.o database.o event.o handler.o config.o \
+ue: utils.o ue.o database.o event.o handler.o configuration.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
 	$(CC) $(CFLAGS) -o ue $^ $(LIBS) $(XLIBS)
 
-vcd: utils.o vcd.o database.o event.o handler.o config.o \
+vcd: utils.o vcd.o database.o event.o handler.o configuration.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
 	$(CC) $(CFLAGS) -o vcd $^ $(LIBS) $(XLIBS)
 
-to_vcd: to_vcd.o database.o event.o handler.o utils.o config.o \
+to_vcd: to_vcd.o database.o event.o handler.o utils.o configuration.o \
          logger/logger.a filter/filter.a
 	$(CC) $(CFLAGS) -o to_vcd $^ $(LIBS)
 
 macpdu2wireshark: macpdu2wireshark.o database.o utils.o handler.o event.o \
-                  config.o
+                  configuration.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
-multi: multi.o utils.o database.o config.o
+multi: multi.o utils.o database.o configuration.o
 	$(CC) $(CFLAGS) -o multi $^ $(LIBS)
 
-gnb: utils.o gnb.o database.o event.o handler.o config.o \
+gnb: utils.o gnb.o database.o event.o handler.o configuration.o \
          view/view.a gui/gui.a logger/logger.a \
          filter/filter.a
 	$(CC) $(CFLAGS) -o gnb $^ $(LIBS) $(XLIBS)
diff --git a/common/utils/T/tracer/config.c b/common/utils/T/tracer/configuration.c
similarity index 97%
rename from common/utils/T/tracer/config.c
rename to common/utils/T/tracer/configuration.c
index 723902ec9c..701043c05e 100644
--- a/common/utils/T/tracer/config.c
+++ b/common/utils/T/tracer/configuration.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "configuration.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/common/utils/T/tracer/config.h b/common/utils/T/tracer/configuration.h
similarity index 100%
rename from common/utils/T/tracer/config.h
rename to common/utils/T/tracer/configuration.h
diff --git a/common/utils/T/tracer/enb.c b/common/utils/T/tracer/enb.c
index ea499a68f8..9a4751b67e 100644
--- a/common/utils/T/tracer/enb.c
+++ b/common/utils/T/tracer/enb.c
@@ -14,7 +14,7 @@
 #include "utils.h"
 #include "event_selector.h"
 #include "openair_logo.h"
-#include "config.h"
+#include "configuration.h"
 
 /****************************************************************************/
 /* conversion from rnti to "ue_id" (which does not really exists)           */
diff --git a/common/utils/T/tracer/event.c b/common/utils/T/tracer/event.c
index f5d12e472c..41da5c0823 100644
--- a/common/utils/T/tracer/event.c
+++ b/common/utils/T/tracer/event.c
@@ -1,7 +1,7 @@
 #include "event.h"
 #include "database.h"
 #include "utils.h"
-#include "config.h"
+#include "configuration.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/common/utils/T/tracer/extract.c b/common/utils/T/tracer/extract.c
index bd1649a31a..fe3177b74a 100644
--- a/common/utils/T/tracer/extract.c
+++ b/common/utils/T/tracer/extract.c
@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include "database.h"
 #include "event.h"
-#include "config.h"
+#include "configuration.h"
 
 void usage(void)
 {
diff --git a/common/utils/T/tracer/extract_input_subframe.c b/common/utils/T/tracer/extract_input_subframe.c
index 48e3ec07f9..78bc288df1 100644
--- a/common/utils/T/tracer/extract_input_subframe.c
+++ b/common/utils/T/tracer/extract_input_subframe.c
@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include "database.h"
 #include "event.h"
-#include "config.h"
+#include "configuration.h"
 
 void usage(void)
 {
diff --git a/common/utils/T/tracer/extract_output_subframe.c b/common/utils/T/tracer/extract_output_subframe.c
index d7f9ff95ed..5c5abb768e 100644
--- a/common/utils/T/tracer/extract_output_subframe.c
+++ b/common/utils/T/tracer/extract_output_subframe.c
@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include "database.h"
 #include "event.h"
-#include "config.h"
+#include "configuration.h"
 
 void usage(void)
 {
diff --git a/common/utils/T/tracer/gnb.c b/common/utils/T/tracer/gnb.c
index 6629a1efd6..a2953cb00d 100644
--- a/common/utils/T/tracer/gnb.c
+++ b/common/utils/T/tracer/gnb.c
@@ -6,7 +6,7 @@
 #include "database.h"
 #include "event.h"
 #include "handler.h"
-#include "config.h"
+#include "configuration.h"
 #include "logger/logger.h"
 #include "gui/gui.h"
 #include "utils.h"
diff --git a/common/utils/T/tracer/hacks/Makefile b/common/utils/T/tracer/hacks/Makefile
index af2663e48f..f345bb4499 100644
--- a/common/utils/T/tracer/hacks/Makefile
+++ b/common/utils/T/tracer/hacks/Makefile
@@ -5,18 +5,18 @@ LIBS=-lX11 -lm -lpng -lXft
 
 all: dump_nack_signal time_meas timeplot multi-rru-clean
 
-dump_nack_signal: ../utils.o ../database.o ../config.o ../event.o \
+dump_nack_signal: ../utils.o ../database.o ../configuration.o ../event.o \
                   dump_nack_signal.o
 	$(CC) $(CFLAGS) -o dump_nack_signal $^ $(LIBS)
 
-time_meas: ../utils.o ../database.o ../config.o ../event.o \
+time_meas: ../utils.o ../database.o ../configuration.o ../event.o \
                   time_meas.o
 	$(CC) $(CFLAGS) -o time_meas $^ $(LIBS)
 
 timplot: timeplot.o
 	$(CC) $(CFLAGS) -o timeplot $^ $(LIBS)
 
-multi-rru-clean: ../utils.o ../database.o ../event.o ../config.o multi-rru-clean.o
+multi-rru-clean: ../utils.o ../database.o ../event.o ../configuration.o multi-rru-clean.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
 
 .PHONY: all
diff --git a/common/utils/T/tracer/macpdu2wireshark.c b/common/utils/T/tracer/macpdu2wireshark.c
index 195bf33335..02720e01f3 100644
--- a/common/utils/T/tracer/macpdu2wireshark.c
+++ b/common/utils/T/tracer/macpdu2wireshark.c
@@ -7,7 +7,7 @@
 #include "database.h"
 #include "event.h"
 #include "handler.h"
-#include "config.h"
+#include "configuration.h"
 #include "utils.h"
 #include "packet-mac-lte.h"
 
diff --git a/common/utils/T/tracer/multi.c b/common/utils/T/tracer/multi.c
index 6a9de838c6..73fadc37d3 100644
--- a/common/utils/T/tracer/multi.c
+++ b/common/utils/T/tracer/multi.c
@@ -8,7 +8,7 @@
 #include "database.h"
 #include "utils.h"
 #include "../T.h"
-#include "config.h"
+#include "configuration.h"
 
 #define DEFAULT_LOCAL_PORT 2022
 
diff --git a/common/utils/T/tracer/record.c b/common/utils/T/tracer/record.c
index a565884e52..e4c059a5ca 100644
--- a/common/utils/T/tracer/record.c
+++ b/common/utils/T/tracer/record.c
@@ -6,7 +6,7 @@
 #include "database.h"
 #include "utils.h"
 #include "../T_defs.h"
-#include "config.h"
+#include "configuration.h"
 
 void usage(void)
 {
diff --git a/common/utils/T/tracer/textlog.c b/common/utils/T/tracer/textlog.c
index 99cddaf43a..71a928ce80 100644
--- a/common/utils/T/tracer/textlog.c
+++ b/common/utils/T/tracer/textlog.c
@@ -11,7 +11,7 @@
 #include "gui/gui.h"
 #include "utils.h"
 #include "event_selector.h"
-#include "config.h"
+#include "configuration.h"
 
 typedef struct {
   int socket;
diff --git a/common/utils/T/tracer/to_vcd.c b/common/utils/T/tracer/to_vcd.c
index a3c13aebf9..be3c839115 100644
--- a/common/utils/T/tracer/to_vcd.c
+++ b/common/utils/T/tracer/to_vcd.c
@@ -8,7 +8,7 @@
 #include "database.h"
 #include "utils.h"
 #include "handler.h"
-#include "config.h"
+#include "configuration.h"
 #include "logger/logger.h"
 #include "view/view.h"
 
diff --git a/common/utils/T/tracer/ue.c b/common/utils/T/tracer/ue.c
index bafa0384f2..31584e0215 100644
--- a/common/utils/T/tracer/ue.c
+++ b/common/utils/T/tracer/ue.c
@@ -14,7 +14,7 @@
 #include "utils.h"
 #include "event_selector.h"
 #include "openair_logo.h"
-#include "config.h"
+#include "configuration.h"
 
 typedef struct {
   view *phyview;
diff --git a/common/utils/T/tracer/vcd.c b/common/utils/T/tracer/vcd.c
index d4faa5fd84..c57798c4c4 100644
--- a/common/utils/T/tracer/vcd.c
+++ b/common/utils/T/tracer/vcd.c
@@ -11,7 +11,7 @@
 #include "gui/gui.h"
 #include "utils.h"
 #include "event_selector.h"
-#include "config.h"
+#include "configuration.h"
 
 typedef struct {
   int socket;