Rename some functions with more useful/clear names (#2127)

This commit is contained in:
Ivan Nardi
2023-10-29 20:21:24 +01:00
committed by GitHub
parent 03fd155ae3
commit 2c2eaf8e79
4 changed files with 10 additions and 10 deletions
+3 -3
View File
@@ -766,8 +766,8 @@ extern "C" {
*/
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod,
const char* path);
int ndpi_load_protocols_file2(struct ndpi_detection_module_struct *ndpi_mod,
FILE *fd);
int ndpi_load_protocols_file_fd(struct ndpi_detection_module_struct *ndpi_mod,
FILE *fd);
/**
* Add an IP-address based risk mask
@@ -810,7 +810,7 @@ extern "C" {
* -1 else
*/
int ndpi_load_categories_file(struct ndpi_detection_module_struct *ndpi_str, const char* path, void *user_data);
int ndpi_load_categories_file2(struct ndpi_detection_module_struct *ndpi_str, FILE *fd, void *user_data);
int ndpi_load_categories_file_fd(struct ndpi_detection_module_struct *ndpi_str, FILE *fd, void *user_data);
/**
* Loads a file (separated by <cr>) of domain names associated with the specified category
+5 -5
View File
@@ -4415,15 +4415,15 @@ int ndpi_load_categories_file(struct ndpi_detection_module_struct *ndpi_str,
return -1;
}
rc = ndpi_load_categories_file2(ndpi_str, fd, user_data);
rc = ndpi_load_categories_file_fd(ndpi_str, fd, user_data);
fclose(fd);
return rc;
}
int ndpi_load_categories_file2(struct ndpi_detection_module_struct *ndpi_str,
FILE *fd, void *user_data) {
int ndpi_load_categories_file_fd(struct ndpi_detection_module_struct *ndpi_str,
FILE *fd, void *user_data) {
char buffer[512], *line, *name, *category, *saveptr;
int len, num = 0;
@@ -4801,14 +4801,14 @@ int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_str, cons
return -1;
}
rc = ndpi_load_protocols_file2(ndpi_str, fd);
rc = ndpi_load_protocols_file_fd(ndpi_str, fd);
fclose(fd);
return rc;
}
int ndpi_load_protocols_file2(struct ndpi_detection_module_struct *ndpi_str, FILE *fd) {
int ndpi_load_protocols_file_fd(struct ndpi_detection_module_struct *ndpi_str, FILE *fd) {
char *buffer, *old_buffer;
int chunk_len = 1024, buffer_len = chunk_len, old_buffer_len;
int i;