detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-07-13 11:21:50 +02:00
Code Issues Actions Packages Releases Activity

moved optstring and long options to the constructor

Browse Source
This commit is contained in:
maliakal_d
2025-07-09 15:02:12 +02:00
parent e1f8c4012f
commit d8ee0c2279
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/src/CommandLineOptions.cpp
View File

@ -11,6 +11,10 @@
#include <cstring> #include <cstring>
#include <unistd.h> #include <unistd.h>
CommandLineOptions::CommandLineOptions(AppType app)
: appType_(app), optString_(buildOptString()),
longOptions_(buildOptionList()) {}
/** for testing */ /** for testing */
ParsedOptions CommandLineOptions::parse(const std::vector<std::string> &args) { ParsedOptions CommandLineOptions::parse(const std::vector<std::string> &args) {
std::vector<char *> argv; std::vector<char *> argv;
@ -28,13 +32,11 @@ ParsedOptions CommandLineOptions::parse(int argc, char *argv[]) {
FrameSyncOptions frame; FrameSyncOptions frame;
base.port = DEFAULT_TCP_RX_PORTNO; base.port = DEFAULT_TCP_RX_PORTNO;
auto optString = buildOptString();
auto longOptions = buildOptionList();
optind = 0; // reset getopt optind = 0; // reset getopt
int opt, option_index = 0; int opt, option_index = 0;
while ((opt = getopt_long(argc, argv, optString.c_str(), longOptions.data(), while ((opt = getopt_long(argc, argv, optString_.c_str(),
&option_index)) != -1) { longOptions_.data(), &option_index)) != -1) {
switch (opt) { switch (opt) {
case 'v': case 'v':
case 'h': case 'h':

4
slsReceiverSoftware/src/CommandLineOptions.h
View File

@ -33,7 +33,7 @@ using ParsedOptions =
class CommandLineOptions { class CommandLineOptions {
public: public:
constexpr explicit CommandLineOptions(AppType app) : appType_(app) {} explicit CommandLineOptions(AppType app);
ParsedOptions parse(const std::vector<std::string> &args); // for testing ParsedOptions parse(const std::vector<std::string> &args); // for testing
ParsedOptions parse(int argc, char *argv[]); ParsedOptions parse(int argc, char *argv[]);
std::string getTypeString() const; std::string getTypeString() const;
@ -46,6 +46,8 @@ class CommandLineOptions {
private: private:
AppType appType_; AppType appType_;
std::string optString_;
std::vector<option> longOptions_;
std::vector<option> buildOptionList() const; std::vector<option> buildOptionList() const;
std::string buildOptString() const; std::string buildOptString() const;