github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-07-06 11:26:44 +00:00
Code Issues Projects Releases Wiki Activity

fix: remove minor string view dependencies

Browse Source 
Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>
This commit is contained in:
Jason Dellaluce 2022-11-28 17:18:33 +00:00 committed by poiana
parent 68f4d5bb59
commit 15b57bd972
5 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/engine/test_falco_utils.cpp
View File

@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
#include "falco_utils.h" #include "falco_utils.h"
#include <nonstd/string_view.hpp>
#include <catch.hpp> #include <catch.hpp>
TEST_CASE("is_unix_scheme matches", "[utils]") TEST_CASE("is_unix_scheme matches", "[utils]")

2
userspace/engine/CMakeLists.txt
View File

@ -39,7 +39,6 @@ if(MINIMAL_BUILD)
PUBLIC PUBLIC
"${NJSON_INCLUDE}" "${NJSON_INCLUDE}"
"${TBB_INCLUDE_DIR}" "${TBB_INCLUDE_DIR}"
"${STRING_VIEW_LITE_INCLUDE}"
"${LIBSCAP_INCLUDE_DIRS}" "${LIBSCAP_INCLUDE_DIRS}"
"${LIBSINSP_INCLUDE_DIRS}" "${LIBSINSP_INCLUDE_DIRS}"
"${YAMLCPP_INCLUDE_DIR}" "${YAMLCPP_INCLUDE_DIR}"
@ -50,7 +49,6 @@ else()
PUBLIC PUBLIC
"${NJSON_INCLUDE}" "${NJSON_INCLUDE}"
"${TBB_INCLUDE_DIR}" "${TBB_INCLUDE_DIR}"
"${STRING_VIEW_LITE_INCLUDE}"
"${LIBSCAP_INCLUDE_DIRS}" "${LIBSCAP_INCLUDE_DIRS}"
"${LIBSINSP_INCLUDE_DIRS}" "${LIBSINSP_INCLUDE_DIRS}"
"${YAMLCPP_INCLUDE_DIR}" "${YAMLCPP_INCLUDE_DIR}"

3
userspace/engine/falco_utils.cpp
View File

@ -20,6 +20,7 @@ limitations under the License.
#include <iomanip> #include <iomanip>
#include "falco_utils.h" #include "falco_utils.h"
#include "utils.h"
#include "banned.h" // This raises a compilation error when certain functions are used #include "banned.h" // This raises a compilation error when certain functions are used
namespace falco namespace falco
@ -77,7 +78,7 @@ namespace network
{ {
bool is_unix_scheme(const std::string& url) bool is_unix_scheme(const std::string& url)
{ {
return url.starts_with(UNIX_SCHEME); return sinsp_utils::startswith(url, UNIX_SCHEME);
} }
} // namespace network } // namespace network
} // namespace utils } // namespace utils

1
userspace/engine/falco_utils.h
View File

@ -24,7 +24,6 @@ limitations under the License.
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <thread> #include <thread>
#include <nonstd/string_view.hpp>
#ifdef __GNUC__ #ifdef __GNUC__
#define likely(x) __builtin_expect(!!(x), 1) #define likely(x) __builtin_expect(!!(x), 1)

1
userspace/falco/CMakeLists.txt
View File

@ -62,7 +62,6 @@ set(
"${PROJECT_SOURCE_DIR}/userspace/engine" "${PROJECT_SOURCE_DIR}/userspace/engine"
"${PROJECT_BINARY_DIR}/userspace/falco" "${PROJECT_BINARY_DIR}/userspace/falco"
"${PROJECT_BINARY_DIR}/driver/src" "${PROJECT_BINARY_DIR}/driver/src"
"${STRING_VIEW_LITE_INCLUDE}"
"${CXXOPTS_INCLUDE_DIR}" "${CXXOPTS_INCLUDE_DIR}"
"${YAMLCPP_INCLUDE_DIR}" "${YAMLCPP_INCLUDE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"