Skip to content

Commit

Permalink
chore: remove legacy naming references
Browse files Browse the repository at this point in the history
Signed-off-by: Jason Dellaluce <[email protected]>
  • Loading branch information
jasondellaluce authored and poiana committed Mar 11, 2022
1 parent aa718d8 commit c4370e7
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 24 deletions.
4 changes: 2 additions & 2 deletions driver/bpf/filler_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This file is dual licensed under either the MIT or GPL 2. See MIT.txt
or GPL2.txt for full copies of the license.
*/
#ifndef __SYSDIGBPF_HELPERS_H
#define __SYSDIGBPF_HELPERS_H
#ifndef __FILLER_HELPERS_H
#define __FILLER_HELPERS_H

#include <linux/compat.h>
#include <net/compat.h>
Expand Down
2 changes: 0 additions & 2 deletions driver/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2477,7 +2477,6 @@ int scap_init(void)

/*
* Initialize the user I/O
* ( + 1 for scap-events)
*/
acrret = alloc_chrdev_region(&dev, 0, num_cpus + 1, DRIVER_DEVICE_NAME);
if (acrret < 0) {
Expand Down Expand Up @@ -2624,7 +2623,6 @@ void scap_exit(void)
if (g_ppm_class)
class_destroy(g_ppm_class);

/* + 1 for scap-events */
unregister_chrdev_region(MKDEV(g_ppm_major, 0), g_ppm_numdevs + 1);

kfree(g_ppm_devs);
Expand Down
2 changes: 1 addition & 1 deletion userspace/chisel/chisel_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ int lua_cbacks::field(lua_State *ls)
{
//
// This happens if the lua code is calling field() without invoking
// sysdig.request_field() before.
// request_field() before.
//
lua_pushnil(ls);
return 1;
Expand Down
6 changes: 3 additions & 3 deletions userspace/libscap/plugin_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ typedef struct
const char* (*get_event_source)();
//
// Return the list of extractor fields exported by this plugin. Extractor
// fields can be used in Falco rule conditions and sysdig filters.
// fields can be used in Falco rule conditions.
// Required: no
// Return value: a string with the list of fields encoded as a json
// array.
Expand Down Expand Up @@ -392,7 +392,7 @@ typedef struct
// - data: the buffer from an event produced by next_batch().
// - datalen: the length of the buffer from an event produced by next_batch().
// Return value: the text representation of the event. This is used, for example,
// by sysdig to print a line for the given event.
// to print a line for the given event.
// The returned memory pointer must be allocated by the plugin
// and must not be deallocated or modified until the next call to
// event_to_string().
Expand Down Expand Up @@ -553,7 +553,7 @@ typedef struct
const char* (*get_extract_event_sources)();
//
// Return the list of extractor fields exported by this plugin. Extractor
// fields can be used in Falco rules and sysdig filters.
// fields can be used in Falco rules.
// Required: yes
// Return value: a string with the list of fields encoded as a json
// array.
Expand Down
4 changes: 2 additions & 2 deletions userspace/libsinsp/eventformatter.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ class SINSP_PUBLIC sinsp_evt_formatter : public gen_event_formatter
\param inspector Pointer to the inspector instance that will generate the
events to be formatter.
\param fmt The printf-like format to use. The accepted format is the same
as the one of the sysdig '-p' command line flag, so refer to the sysdig
manual for details.
as the one of the output in Falco rules, so refer to the Falco
documentation for details.
*/
sinsp_evt_formatter(sinsp* inspector, filter_check_list &available_checks = g_filterlist);

Expand Down
14 changes: 0 additions & 14 deletions userspace/libsinsp/sinsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,6 @@ class SINSP_PUBLIC sinsp : public capture_stats_source, public wmi_handle_source
\brief Set the runtime flag for resolving the timespan in a human
readable mode.
\note Moved to the inspector due to sysdig#426 issue
\param flag Can be 'h', 'a', 'r', 'd', 'D' as documented in the manual.
*/
inline void set_time_output_mode(char flag)
Expand Down Expand Up @@ -1346,18 +1344,6 @@ VISIBILITY_PRIVATE
friend class test_helper;

template<class TKey,class THash,class TCompare> friend class sinsp_connection_manager;

#ifdef SYSDIG_TEST
protected:
void inject_machine_info(const scap_machine_info *value)
{
m_machine_info = value;
}
void inject_network_interfaces(sinsp_network_interfaces *value)
{
m_network_interfaces = value;
}
#endif // SYSDIG_TEST
};

/*@}*/

0 comments on commit c4370e7

Please sign in to comment.