diff options
author | Oliver Smith <osmith@sysmocom.de> | 2018-12-12 16:03:38 +0100 |
---|---|---|
committer | Oliver Smith <osmith@sysmocom.de> | 2018-12-12 16:55:33 +0100 |
commit | 12b059ccc2aa1d083a03d6bd85b3205ea89d1bd1 (patch) | |
tree | 15f88ea6ba97a912c29ad2d9a84d35fe4aa0d294 | |
parent | 29189367dbafd56f81bcf9b1287e52d35826c278 (diff) |
WIP: move comma_delimited_to_vector to Utils.cpposmith/select-limesdr-by-serial
Change-Id: If3f0f682ca453c2b0a06175ec9626567932cfce6
-rw-r--r-- | CommonLibs/Makefile.am | 2 | ||||
-rw-r--r-- | CommonLibs/Utils.cpp | 36 | ||||
-rw-r--r-- | CommonLibs/Utils.h | 24 | ||||
-rw-r--r-- | Transceiver52M/osmo-trx.cpp | 16 |
4 files changed, 63 insertions, 15 deletions
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 @@ libcommon_la_SOURCES = \ 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 @@ noinst_HEADERS = \ 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..2022193 --- /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(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..47cec69 --- /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(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 @@ static void setup_signal_handlers() 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" |