libdlogutil: Consistent state & config member naming

Rename dlogutil_state.logs_dump to .dump_size, consistently with
dlogutil_config.dump_size (which contains exactly same information).

Change-Id: I34cbe6182d32ac42a45054c731333a164273dc48

diff --git a/include/logretrieve.h b/include/logretrieve.h
index 6c9a0b2..9fb899b 100644 (file)
--- a/include/logretrieve.h
+++ b/include/logretrieve.h
@@ -29,7 +29,7 @@ typedef struct dlogutil_state {
        bool *enabled;
        struct fd_info **data_fds;
        int fd_count;
-       unsigned int logs_dump;
+       unsigned int dump_size;                  // max entries to return (in dump mode only)
        dlogutil_mode_e mode;
        bool need_epoll;
        dlogutil_filter_options_s *filter_object;

diff --git a/src/libdlogutil/logretrieve.c b/src/libdlogutil/logretrieve.c
index 5348d76..1c26221 100644 (file)
--- a/src/libdlogutil/logretrieve.c
+++ b/src/libdlogutil/logretrieve.c
@@ -174,7 +174,7 @@ int dlogutil_state_init(dlogutil_state_s *state, struct fd_info ***data_fds_ptr,
        state->mode = config->mode;
        state->need_epoll = true;
        state->flush_target = LONG_MAX;
-       state->logs_dump = (config->mode == DLOGUTIL_MODE_DUMP) ? config->dump_size : 0;
+       state->dump_size = (config->mode == DLOGUTIL_MODE_DUMP) ? config->dump_size : 0;
        *data_fds_ptr = NULL;
        sort_vector_init(&state->logs);
        state->filter_object = config->filter ? log_filter_from_filter(config->filter) : dlogutil_filter_options_create();
@@ -196,8 +196,8 @@ int dlogutil_state_init(dlogutil_state_s *state, struct fd_info ***data_fds_ptr,
        ;
        state->logs.sort_by = sort_by;
 
-       if (config->mode == DLOGUTIL_MODE_DUMP && state->logs_dump != DLOGUTIL_MAX_DUMP_SIZE)
-               state->logs.size = state->logs_dump + 1;
+       if (config->mode == DLOGUTIL_MODE_DUMP && state->dump_size != DLOGUTIL_MAX_DUMP_SIZE)
+               state->logs.size = state->dump_size + 1;
 
        clock_gettime(get_proper_clock(sort_by), &state->logs.start);
        if (!sort_vector_finalize(&state->logs))
@@ -208,7 +208,7 @@ int dlogutil_state_init(dlogutil_state_s *state, struct fd_info ***data_fds_ptr,
                return -ENOMEM;
 
        for (int nfds = 0; nfds < fd_count; ++nfds) {
-               int r = data_fds[nfds]->ops->prepare_print(data_fds[nfds], state->logs_dump, state->mode == DLOGUTIL_MODE_MONITOR, state->filter_object);
+               int r = data_fds[nfds]->ops->prepare_print(data_fds[nfds], state->dump_size, state->mode == DLOGUTIL_MODE_MONITOR, state->filter_object);
                if (r < 0)
                        return r;
                if (r > 0) {
@@ -372,7 +372,7 @@ int do_print_once(dlogutil_state_s *state, int timeout, dlogutil_entry_s **out)
        }
 
        const bool is_limited_dumping = state->mode == DLOGUTIL_MODE_DUMP
-               && state->logs_dump != DLOGUTIL_MAX_DUMP_SIZE;
+               && state->dump_size != DLOGUTIL_MAX_DUMP_SIZE;
 
        while (state->epoll_cnt > 0) {
                // TODO: Reuse now somehow
@@ -425,7 +425,7 @@ int do_print_once(dlogutil_state_s *state, int timeout, dlogutil_entry_s **out)
                return 0;
 
        if (is_limited_dumping)
-               while (sort_vector_used_size(&state->logs) > state->logs_dump)
+               while (sort_vector_used_size(&state->logs) > state->dump_size)
                        sort_vector_pop(&state->logs);
 
        if (!sort_vector_empty(&state->logs)) {