Rename log_add_filter_tid to dlogutil_filter_options_tid

Change-Id: Idaee63aacd2fc8cf62048a9792b5ce38d052958c

diff --git a/include/logprint.h b/include/logprint.h
index d19e584..bd10c77 100644 (file)
--- a/include/logprint.h
+++ b/include/logprint.h
@@ -118,7 +118,7 @@ int log_add_filter_pid(struct dlogutil_filter_options *p_filter, pid_t pid);
  *
  */
 
-int log_add_filter_tid(struct dlogutil_filter_options *p_filter, pid_t tid);
+int dlogutil_filter_options_tid(struct dlogutil_filter_options *p_filter, pid_t tid);
 
 void log_filter_clear(struct dlogutil_filter_options *p_filter);
 

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

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

diff --git a/src/shared/logprint.c b/src/shared/logprint.c
index 06157f0..11703aa 100644 (file)
--- a/src/shared/logprint.c
+++ b/src/shared/logprint.c
@@ -523,7 +523,7 @@ int log_add_filter_pid(struct dlogutil_filter_options *p_filter, pid_t pid)
  * @return 0 on success, else -ENOMEM
  * @remarks Assumes single threaded execution
  */
-int log_add_filter_tid(struct dlogutil_filter_options *p_filter, pid_t tid)
+int dlogutil_filter_options_tid(struct dlogutil_filter_options *p_filter, pid_t tid)
 {
        assert(p_filter);
 

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

diff --git a/src/tests/filters.c b/src/tests/filters.c
index dee1fb8..f367293 100644 (file)
--- a/src/tests/filters.c
+++ b/src/tests/filters.c
@@ -370,10 +370,10 @@ int main()
        //tid filtering rules
        p_filter = log_filter_new();
        result += check_print_line_tid(__LINE__, p_filter, 0);
-       err = log_add_filter_tid(p_filter, 9876);
+       err = dlogutil_filter_options_tid(p_filter, 9876);
        assert(err == 0);
        result += check_print_line_tid(__LINE__, p_filter, 9876);
-       err = log_add_filter_tid(p_filter, pid_tid_filter_list[0]);
+       err = dlogutil_filter_options_tid(p_filter, pid_tid_filter_list[0]);
        assert(err == 0);
        result += check_print_line_tid(__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 8e356e8..0f4a516 100644 (file)
--- a/src/tests/logprint.c
+++ b/src/tests/logprint.c
@@ -527,7 +527,7 @@ void check_syscall_failure_handling()
 {
        struct dlogutil_filter_options *const filter = log_filter_new();
        assert(filter);
-       assert(!log_add_filter_tid(filter, 123));
+       assert(!dlogutil_filter_options_tid(filter, 123));
        assert(!log_add_filter_pid(filter, 456));
        assert(!log_add_filter_rule(filter, "FOO:E"));
 
@@ -538,7 +538,7 @@ void check_syscall_failure_handling()
        fail_alloc = true;
        assert(!log_filter_new());
        assert(!log_filter_from_filter(filter));
-       assert(-ENOMEM == log_add_filter_tid(filter, 123));
+       assert(-ENOMEM == dlogutil_filter_options_tid(filter, 123));
        assert(-ENOMEM == log_add_filter_pid(filter, 456));
        fail_alloc = false;