cleanup: rename a method

Signed-off-by: Andrea Terzolo <[email protected]>
falcosecurity · Oct 30, 2024 · 2c5dad8 · 2c5dad8
1 parent 7204a0b
commit 2c5dad8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/userspace/libsinsp/sinsp_filtercheck_fd.cpp b/userspace/libsinsp/sinsp_filtercheck_fd.cpp
@@ -374,9 +374,9 @@ int32_t sinsp_filter_check_fd::parse_field_name(std::string_view val,
 	return sinsp_filter_check::parse_field_name(val, alloc_state, needed_for_filtering);
 }
 
-bool sinsp_filter_check_fd::extract_fdname_from_creator(sinsp_evt *evt,
-                                                        bool sanitize_strings,
-                                                        bool fd_nameraw) {
+bool sinsp_filter_check_fd::extract_fdname_from_event(sinsp_evt *evt,
+                                                      bool sanitize_strings,
+                                                      bool fd_nameraw) {
 	const char *resolved_argstr;
 	uint16_t etype = evt->get_type();
 
@@ -537,7 +537,7 @@ uint8_t *sinsp_filter_check_fd::extract_single(sinsp_evt *evt,
 			int64_t retval = evt->get_param(0)->as<int64_t>();
 			// this is a weird behavior, see the `net_connect_exit_event_fails` test for more info
 			if(retval < 0) {
-				if(!extract_fdname_from_creator(evt, sanitize_strings)) {
+				if(!extract_fdname_from_event(evt, sanitize_strings)) {
 					return NULL;
 				}
 				if(m_field_id == TYPE_CONTAINERNAME) {
@@ -549,7 +549,7 @@ uint8_t *sinsp_filter_check_fd::extract_single(sinsp_evt *evt,
 		}
 
 		if(m_fdinfo == NULL) {
-			if(!extract_fdname_from_creator(evt, sanitize_strings)) {
+			if(!extract_fdname_from_event(evt, sanitize_strings)) {
 				return NULL;
 			}
 		} else {
@@ -578,7 +578,7 @@ uint8_t *sinsp_filter_check_fd::extract_single(sinsp_evt *evt,
 	case TYPE_DIRECTORY:
 	case TYPE_CONTAINERDIRECTORY: {
 		if(m_fdinfo == NULL) {
-			if(!extract_fdname_from_creator(evt, sanitize_strings)) {
+			if(!extract_fdname_from_event(evt, sanitize_strings)) {
 				return NULL;
 			}
 		} else if(!(m_fdinfo->is_file() || m_fdinfo->is_directory())) {
@@ -1226,7 +1226,7 @@ uint8_t *sinsp_filter_check_fd::extract_single(sinsp_evt *evt,
 	} break;
 	case TYPE_FDNAMERAW: {
 		if(m_fdinfo == NULL) {
-			if(!extract_fdname_from_creator(evt, sanitize_strings, true)) {
+			if(!extract_fdname_from_event(evt, sanitize_strings, true)) {
 				return NULL;
 			}
 		} else {

diff --git a/userspace/libsinsp/sinsp_filtercheck_fd.h b/userspace/libsinsp/sinsp_filtercheck_fd.h
@@ -88,9 +88,7 @@ class sinsp_filter_check_fd : public sinsp_filter_check {
 
 private:
 	int32_t extract_arg(std::string_view fldname, std::string_view val);
-	bool extract_fdname_from_creator(sinsp_evt* evt,
-	                                 bool sanitize_strings,
-	                                 bool fd_nameraw = false);
+	bool extract_fdname_from_event(sinsp_evt* evt, bool sanitize_strings, bool fd_nameraw = false);
 	bool extract_fd(sinsp_evt* evt);
 
 	bool compare_ip(sinsp_evt* evt);

diff --git a/userspace/libsinsp/sinsp_filtercheck_fspath.cpp b/userspace/libsinsp/sinsp_filtercheck_fspath.cpp
@@ -401,7 +401,7 @@ uint8_t* sinsp_filter_check_fspath::extract_single(sinsp_evt* evt,
 
 		if(!std::filesystem::path(m_tstr).is_absolute()) {
 			std::string sdir;  // init
-			// Compare to `sinsp_filter_check_fd::extract_fdname_from_creator` logic
+			// Compare to `sinsp_filter_check_fd::extract_fdname_from_event` logic
 			// note: no implementation for old / legacy event definitions
 			switch(evt->get_type()) {
 			// For openat, event fdinfo is already correctly expanded by parsers;