detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-14 05:47:14 +02:00
Code Issues Actions Packages Releases Activity

strcpy and cleanup of configuremac

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-14 15:33:35 +01:00
parent 172c9218d1
commit 991567ba1c
4 changed files with 102 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsSupportLib/include/string_utils.h
View File

@ -18,6 +18,22 @@ void strcpy_safe(char (&destination)[array_size], const char *source) {
destination[array_size - 1] = '\0';
}
/*
Removes all occurrences of the specified char from a c string
Templated on array size to ensure no access after buffer limits.
*/
template <size_t array_size>
void removeChar(char (&str)[array_size], char ch) {
int count = 0;
for (int i = 0; str[i]; i++) {
if (str[i] != ch)
str[count++] = str[i];
if (i == array_size - 1)
break;
}
str[count] = '\0';
}
/*
Split a string using the specified delimeter and return a vector of strings.
TODO! Look into switching to absl or a string_view based implementation. Current
@ -33,11 +49,11 @@ std::string concatenateNonEmptyStrings(const std::vector<std::string> &vec);
/*
Concatenate strings using + if the strings are different
*/
std::string concatenateIfDifferent(std::vector<std::string> container);
std::string concatenateIfDifferent(const std::vector<std::string> &container);
/*
Convert an ip address string to a string in hex format. (removing dots)
*/
std::string stringIpToHex(const std::string& ip);
std::string stringIpToHex(const std::string &ip);
}; // namespace sls

4
slsSupportLib/src/string_utils.cpp
View File

@ -3,6 +3,7 @@
#include "container_utils.h"
#include <sstream>
#include <iomanip>
#include <algorithm>
namespace sls{
@ -26,7 +27,7 @@ std::string concatenateNonEmptyStrings(const std::vector<std::string>& vec){
return ret;
}
std::string concatenateIfDifferent(std::vector<std::string> container)
std::string concatenateIfDifferent(const std::vector<std::string>& container)
{
if (allEqual(container)) {
return container.front();
@ -51,4 +52,5 @@ std::string stringIpToHex(const std::string& ip)
}
}; // namespace sls