Rename log_add_filter_pid to dlogutil_filter_options_pid

Change-Id: I5ed69dddb731f57d1f545110b306351f8ae379e0

diff --git a/include/logprint.h b/include/logprint.h
index bd10c77..525c8d9 100644 (file)
--- a/include/logprint.h
+++ b/include/logprint.h
@@ -103,7 +103,7 @@ int log_add_filter_string(struct dlogutil_filter_options *p_filter, const char *
  *
  */
 
-int log_add_filter_pid(struct dlogutil_filter_options *p_filter, pid_t pid);
+int dlogutil_filter_options_pid(struct dlogutil_filter_options *p_filter, pid_t pid);
 
 
 /**

diff --git a/src/logger/logger.c b/src/logger/logger.c
index fa0d4fb..bb52c04 100644 (file)
--- a/src/logger/logger.c
+++ b/src/logger/logger.c
@@ -1111,7 +1111,7 @@ static int parse_command_line(const char *cmdl, struct writer *wr, struct logger
                }
                case 1: {
                        pid_t pid;
-                       if (sscanf(optarg, "%d", &pid) != 1 || log_add_filter_pid(reader->filter, pid))
+                       if (sscanf(optarg, "%d", &pid) != 1 || dlogutil_filter_options_pid(reader->filter, pid))
                                goto cleanup;
                        break;
                }

diff --git a/src/logutil/logutil.c b/src/logutil/logutil.c
index 38a4fea..a6e7e3e 100644 (file)
--- a/src/logutil/logutil.c
+++ b/src/logutil/logutil.c
@@ -91,7 +91,7 @@ int parse_options(int argc, char **argv, struct log_file *l_file, int *enabled_b
                        int pid;
                        if (sscanf(optarg, "%d", &pid) != 1)
                                err_arg_nondigit = 1;
-                       else if (log_add_filter_pid(opt->filter_object, pid))
+                       else if (dlogutil_filter_options_pid(opt->filter_object, pid))
                                goto enomem;
                        break;
                }

diff --git a/src/shared/logprint.c b/src/shared/logprint.c
index 11703aa..2da2c95 100644 (file)
--- a/src/shared/logprint.c
+++ b/src/shared/logprint.c
@@ -504,7 +504,7 @@ error:
  * @return 0 on success, else -ENOMEM
  * @remarks Assumes single threaded execution
  */
-int log_add_filter_pid(struct dlogutil_filter_options *p_filter, pid_t pid)
+int dlogutil_filter_options_pid(struct dlogutil_filter_options *p_filter, pid_t pid)
 {
        assert(p_filter);
 

diff --git a/src/tests/fdi_pipe.c b/src/tests/fdi_pipe.c
index cfe2105..b797733 100644 (file)
--- a/src/tests/fdi_pipe.c
+++ b/src/tests/fdi_pipe.c
@@ -153,7 +153,7 @@ int main()
        assert(ops_pipe.prepare_print(&info, false, filter) == -1);
 
        dlogutil_filter_options_tid(filter, 123);
-       log_add_filter_pid(filter, 456);
+       dlogutil_filter_options_pid(filter, 456);
        correct_send_data = "dlogutil --pid 456 --tid 123 filter1:V filter0:V *:S";
        correct_send_datalen = strlen(correct_send_data) + 1;
        assert(ops_pipe.prepare_print(&info, false, filter) == -1);

diff --git a/src/tests/filters.c b/src/tests/filters.c
index f367293..44bc676 100644 (file)
--- a/src/tests/filters.c
+++ b/src/tests/filters.c
@@ -359,10 +359,10 @@ int main()
        //pid filtering rules
        p_filter = log_filter_new();
        result += check_print_line_pid(__LINE__, p_filter, 0);
-       err = log_add_filter_pid(p_filter, 9876);
+       err = dlogutil_filter_options_pid(p_filter, 9876);
        assert(err == 0);
        result += check_print_line_pid(__LINE__, p_filter, 9876);
-       err = log_add_filter_pid(p_filter, pid_tid_filter_list[0]);
+       err = dlogutil_filter_options_pid(p_filter, pid_tid_filter_list[0]);
        assert(err == 0);
        result += check_print_line_pid(__LINE__, p_filter, pid_tid_filter_list[0]);
        log_filter_free(p_filter);

diff --git a/src/tests/logprint.c b/src/tests/logprint.c
index 0f4a516..2a2b4cb 100644 (file)
--- a/src/tests/logprint.c
+++ b/src/tests/logprint.c
@@ -528,7 +528,7 @@ void check_syscall_failure_handling()
        struct dlogutil_filter_options *const filter = log_filter_new();
        assert(filter);
        assert(!dlogutil_filter_options_tid(filter, 123));
-       assert(!log_add_filter_pid(filter, 456));
+       assert(!dlogutil_filter_options_pid(filter, 456));
        assert(!log_add_filter_rule(filter, "FOO:E"));
 
        struct dlogutil_filter_options *const clone = log_filter_from_filter(filter);
@@ -539,7 +539,7 @@ void check_syscall_failure_handling()
        assert(!log_filter_new());
        assert(!log_filter_from_filter(filter));
        assert(-ENOMEM == dlogutil_filter_options_tid(filter, 123));
-       assert(-ENOMEM == log_add_filter_pid(filter, 456));
+       assert(-ENOMEM == dlogutil_filter_options_pid(filter, 456));
        fail_alloc = false;
 
        // Not really a syscall, but eh