Skip to content

Commit 3b4e832

Browse files
committed
cleanup(userspace): Use prefixed includes for Falco libs headers
Make sure we include Falco libs headers using a prefix, e.g. #include <libsinsp/sinsp.h> instead of #include <sinsp.h> This reduces the risk of collisions for common names like "utils.h". Signed-off-by: Gerald Combs <[email protected]>
1 parent 0346817 commit 3b4e832

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

userspace/sinspui/cursescomponents.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ using namespace std;
3737
#include <libsinsp/sinsp_int.h>
3838
#include <libsinsp/filter.h>
3939
#include <libsinsp/filterchecks.h>
40+
#include <libsinsp/utils.h>
4041

4142
#include <chisel/chisel_table.h>
4243
#include <chisel/chisel_viewinfo.h>
4344
#include "cursescomponents.h"
4445
#include "cursestable.h"
4546
#include "cursesui.h"
46-
#include "utils.h"
4747

4848
extern bool g_filterchecks_force_raw_times;
4949

userspace/sysdig/csysdig.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ limitations under the License.
5757
#include "cursescomponents.h"
5858
#include "cursestable.h"
5959
#include "cursesui.h"
60-
#include "scap_open_exception.h"
60+
#include <libsinsp/scap_open_exception.h>
6161
#include <chisel/chisel_capture_interrupt_exception.h>
6262

6363
#define MOUSE_CAPABLE_TERM "xterm-1003"

userspace/sysdig/sysdig.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ limitations under the License.
3232

3333
#include <libsinsp/sinsp.h>
3434
#include <libsinsp/sinsp_cycledumper.h>
35-
#include "scap_open_exception.h"
35+
#include <libsinsp/scap_open_exception.h>
36+
#include <libsinsp/utils.h>
37+
#include <libsinsp/plugin.h>
38+
#include <libsinsp/plugin_manager.h>
3639
#include <chisel/chisel_capture_interrupt_exception.h>
3740
#ifdef HAS_CAPTURE
3841
#ifndef WIN32
@@ -45,9 +48,6 @@ limitations under the License.
4548
#include <chisel/chisel_utils.h>
4649
#include <chisel/chisel_fields_info.h>
4750
#endif
48-
#include "utils.h"
49-
#include "plugin.h"
50-
#include "plugin_manager.h"
5151

5252
#include "utils/sinsp_opener.h"
5353
#include "utils/plugin_utils.h"

userspace/sysdig/utils/plugin_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ limitations under the License.
2727
#include <yaml-cpp/yaml.h>
2828
#include <nlohmann/json.hpp>
2929

30-
#include <filterchecks.h>
31-
#include <plugin_manager.h>
30+
#include <libsinsp/filterchecks.h>
31+
#include <libsinsp/plugin_manager.h>
3232

3333
#ifdef _WIN32
3434
#define SHAREDOBJ_PREFIX ""

userspace/sysdig/utils/plugin_utils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ limitations under the License.
2323
#include <string>
2424
#include <memory>
2525
#include <unordered_set>
26-
#include <sinsp.h>
27-
#include <plugin.h>
26+
#include <libsinsp/sinsp.h>
27+
#include <libsinsp/plugin.h>
2828

2929
class plugin_utils
3030
{

userspace/sysdig/utils/sinsp_opener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222

2323
#include "sinsp_opener.h"
2424

25-
#include <sinsp_exception.h>
25+
#include <libsinsp/sinsp_exception.h>
2626
#ifdef HAS_CAPTURE
2727
#ifndef WIN32
2828
#include "driver_config.h"

userspace/sysdig/utils/sinsp_opener.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
*/
1919
#pragma once
2020

21-
#include <sinsp.h>
21+
#include <libsinsp/sinsp.h>
2222

2323
#include <string>
2424

userspace/sysdig/utils/supported_events.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ limitations under the License.
1818
*/
1919
#pragma once
2020

21-
#include <sinsp.h>
21+
#include <libsinsp/sinsp.h>
2222

2323
void print_supported_events(sinsp* inspector, bool markdown);

userspace/sysdig/utils/supported_fields.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919

2020
#include "common.h"
2121
#include "supported_fields.h"
22-
#include <filterchecks.h>
22+
#include <libsinsp/filterchecks.h>
2323

2424
#include <map>
2525
#include <set>

userspace/sysdig/utils/supported_fields.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
#pragma once
2121

2222
#include <string>
23-
#include <sinsp.h>
23+
#include <libsinsp/sinsp.h>
2424
#include "plugin_utils.h"
2525

2626
void print_supported_fields(

0 commit comments

Comments
 (0)