Change in osmo-trx[master]: osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12278


Change subject: osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp
......................................................................

osmo-trx.cpp: move comma_delimited_to_vector() to Utils.cpp

Make the "opt" argument const. This function will also be used by
LMSDevice.cpp in a follow-up commit.

Related: OS#3654
Change-Id: If3f0f682ca453c2b0a06175ec9626567932cfce6
---
M CommonLibs/Makefile.am
A CommonLibs/Utils.cpp
A CommonLibs/Utils.h
M Transceiver52M/osmo-trx.cpp
4 files changed, 63 insertions(+), 15 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/78/12278/1

diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am
index 9fabcf1..83bd0c0 100644
--- a/CommonLibs/Makefile.am
+++ b/CommonLibs/Makefile.am
@@ -34,6 +34,7 @@
 	Threads.cpp \
 	Timeval.cpp \
 	Logger.cpp \
+	Utils.cpp \
 	trx_vty.c \
 	debug.c
 libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
@@ -48,6 +49,7 @@
 	Timeval.h \
 	Vector.h \
 	Logger.h \
+	Utils.h \
 	trx_vty.h \
 	debug.h \
 	osmo_signal.h \
diff --git a/CommonLibs/Utils.cpp b/CommonLibs/Utils.cpp
new file mode 100644
index 0000000..6cd4f84
--- /dev/null
+++ b/CommonLibs/Utils.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2018 sysmocom - s.f.m.c. GmbH
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <vector>
+#include <string>
+#include <sstream>
+
+std::vector<std::string> comma_delimited_to_vector(const char* opt)
+{
+	std::string str = std::string(opt);
+	std::vector<std::string> result;
+	std::stringstream ss(str);
+
+	while( ss.good() )
+	{
+	    std::string substr;
+	    getline(ss, substr, ',');
+	    result.push_back(substr);
+	}
+	return result;
+}
diff --git a/CommonLibs/Utils.h b/CommonLibs/Utils.h
new file mode 100644
index 0000000..4f0fbc0
--- /dev/null
+++ b/CommonLibs/Utils.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2018 sysmocom - s.f.m.c. GmbH
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#pragma once
+
+#include <vector>
+#include <string>
+
+std::vector<std::string> comma_delimited_to_vector(const char* opt);
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 2b69da4..0e63020 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -22,6 +22,7 @@
 
 #include "Transceiver.h"
 #include "radioDevice.h"
+#include "Utils.h"
 
 #include <time.h>
 #include <signal.h>
@@ -194,21 +195,6 @@
 	osmo_init_ignore_signals();
 }
 
-static std::vector<std::string> comma_delimited_to_vector(char* opt)
-{
-	std::string str = std::string(opt);
-	std::vector<std::string> result;
-	std::stringstream ss(str);
-
-	while( ss.good() )
-	{
-	    std::string substr;
-	    getline(ss, substr, ',');
-	    result.push_back(substr);
-	}
-	return result;
-}
-
 static void print_help()
 {
 	fprintf(stdout, "Options:\n"

-- 
To view, visit https://gerrit.osmocom.org/12278
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3f0f682ca453c2b0a06175ec9626567932cfce6
Gerrit-Change-Number: 12278
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181212/265a29c7/attachment.htm>