libdlogutil: get_logs_internal accepts a config_s

Change-Id: Iaf7e40ed75a603f356061d17e032e6b5831809e6

diff --git a/src/libdlogutil/lib.c b/src/libdlogutil/lib.c
index a24ae6b..2ee4a46 100644 (file)
--- a/src/libdlogutil/lib.c
+++ b/src/libdlogutil/lib.c
@@ -207,8 +207,7 @@ EXPORT_API void dlogutil_state_destroy(dlogutil_state_s *state)
 }
 
 static int dlogutil_get_logs_internal(int buffers, unsigned int mode, bool monitor,
-       dlogutil_sorting_options_s *sorting, dlogutil_filter_options_s *filter,
-       dlogutil_state_s **out_state)
+       dlogutil_config_s *config, dlogutil_state_s **out_state)
 {
        assert(mode == DLOGUTIL_MODE_CONTINUOUS || !monitor);
 
@@ -227,13 +226,13 @@ static int dlogutil_get_logs_internal(int buffers, unsigned int mode, bool monit
 
        bool sorting_needed;
        dlogutil_sorting_order_e proper_sort_by =
-               get_proper_sort_by(sorting ? sorting->sort_by : DLOGUTIL_SORT_DEFAULT, buffers, is_pipe, &conf, &sorting_needed);
+               get_proper_sort_by((config && config->sorting) ? config->sorting->sort_by : DLOGUTIL_SORT_DEFAULT, buffers, is_pipe, &conf, &sorting_needed);
 
        dlogutil_state_s *state = malloc(sizeof(struct dlogutil_state));
        if (!state)
                return TIZEN_ERROR_OUT_OF_MEMORY;
 
-       r = dlogutil_state_init(state, &fdi_ptrs, fdi_cnt, mode, monitor, sorting, filter, sorting_needed, proper_sort_by, &conf);
+       r = dlogutil_state_init(state, &fdi_ptrs, fdi_cnt, mode, monitor, config ? config->sorting : NULL, config ? config->filter : NULL, sorting_needed, proper_sort_by, &conf);
        if (r)
                return r;
 
@@ -243,12 +242,12 @@ static int dlogutil_get_logs_internal(int buffers, unsigned int mode, bool monit
 
 EXPORT_API int dlogutil_prepare_continuous(int buffers, dlogutil_config_s *config, dlogutil_state_s **state_out)
 {
-       return dlogutil_get_logs_internal(buffers, 0, false, config ? config->sorting : NULL, config ? config->filter : NULL, state_out);
+       return dlogutil_get_logs_internal(buffers, 0, false, config, state_out);
 }
 
 EXPORT_API int dlogutil_prepare_monitor(int buffers, dlogutil_config_s *config, dlogutil_state_s **state_out)
 {
-       return dlogutil_get_logs_internal(buffers, 0, true, config ? config->sorting : NULL, config ? config->filter : NULL, state_out);
+       return dlogutil_get_logs_internal(buffers, 0, true, config, state_out);
 }
 
 EXPORT_API int dlogutil_prepare_dump(int buffers, unsigned int entry_count, dlogutil_config_s *config, dlogutil_state_s **state_out)
@@ -257,7 +256,7 @@ EXPORT_API int dlogutil_prepare_dump(int buffers, unsigned int entry_count, dlog
                return TIZEN_ERROR_INVALID_PARAMETER;
        static_assert(DLOGUTIL_MODE_CONTINUOUS == 0, "DLOGUTIL_MODE_CONTINUOUS is not 0");
 
-       return dlogutil_get_logs_internal(buffers, entry_count, false, config ? config->sorting : NULL, config ? config->filter : NULL, state_out);
+       return dlogutil_get_logs_internal(buffers, entry_count, false, config, state_out);
 }
 
 EXPORT_API int dlogutil_get_log(dlogutil_state_s *state, int timeout, dlogutil_entry_s **entry_out)