[MERGED] osmo-trx[master]: Drop use of ConfigurationTable gConfig

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged.

Change subject: Drop use of ConfigurationTable gConfig
......................................................................


Drop use of ConfigurationTable gConfig

After latest changes, it is not being used anymore.

Change-Id: I43a49aee94e3239194ad9742fb6374324acac0de
---
M CommonLibs/LogTest.cpp
M CommonLibs/Logger.cpp
M Transceiver52M/osmo-trx.cpp
3 files changed, 0 insertions(+), 12 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/CommonLibs/LogTest.cpp b/CommonLibs/LogTest.cpp
index 882707d..2245386 100644
--- a/CommonLibs/LogTest.cpp
+++ b/CommonLibs/LogTest.cpp
@@ -28,10 +28,6 @@
 #include <iterator>
 
 #include "Logger.h"
-#include "Configuration.h"
-
-ConfigurationTable gConfig;
-//ConfigurationTable gConfig("example.config");
 
 void printAlarms()
 {
diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp
index 1c462e7..5b8da99 100644
--- a/CommonLibs/Logger.cpp
+++ b/CommonLibs/Logger.cpp
@@ -32,7 +32,6 @@
 #include <stdarg.h>
 #include <sys/time.h>	// For gettimeofday
 
-#include "Configuration.h"
 #include "Logger.h"
 #include "Threads.h"	// pat added
 
@@ -41,15 +40,11 @@
 using namespace std;
 
 // Switches to enable/disable logging targets
-// MUST BE DEFINED BEFORE gConfig FOR gLogEarly() TO WORK CORRECTLY
 bool gLogToConsole = true;
 bool gLogToSyslog = false;
 FILE *gLogToFile = NULL;
 Mutex gLogToLock;
 
-
-// Reference to a global config table, used all over the system.
-extern ConfigurationTable gConfig;
 // Global log level threshold:
 int config_log_level;
 
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 3f72fb7..44da638 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -31,7 +31,6 @@
 
 #include <GSMCommon.h>
 #include <Logger.h>
-#include <Configuration.h>
 
 extern "C" {
 #include "convolve.h"
@@ -81,8 +80,6 @@
 	bool edge;
 	int sched_rr;
 };
-
-ConfigurationTable gConfig;
 
 volatile bool gshutdown = false;
 

-- 
To view, visit https://gerrit.osmocom.org/5703
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I43a49aee94e3239194ad9742fb6374324acac0de
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>