Create a typedef for dlogutil_sorting_order

Change-Id: Ic600f59f30a686e43bb459773aa07f4892fca586

diff --git a/include/log_file.h b/include/log_file.h
index c8ce41b..364df4a 100644 (file)
--- a/include/log_file.h
+++ b/include/log_file.h
@@ -55,14 +55,14 @@ int logfile_set_path(struct log_file *l_file, const char *path);
 int logfile_open(struct log_file *l_file);
 int logfile_rotate_needed(struct log_file *l_file);
 void logfile_do_rotate(struct log_file *file);
-int logfile_write_with_rotation(const struct dlogutil_entry *e, struct log_file *file, enum dlogutil_sorting_order sort_by);
+int logfile_write_with_rotation(const struct dlogutil_entry *e, struct log_file *file, dlogutil_sorting_order_e sort_by);
 
 typedef int dlogutil_write_cb(const struct dlogutil_entry *e, void *userdata);
 
 struct logfile_callback_data
 {
        struct log_file *file;
-       enum dlogutil_sorting_order sort_by;
+       dlogutil_sorting_order_e sort_by;
 };
 int logfile_callback(const struct dlogutil_entry *e, void *userdata);
 

diff --git a/include/logconfig.h b/include/logconfig.h
index 3023d4f..9728cb2 100644 (file)
--- a/include/logconfig.h
+++ b/include/logconfig.h
@@ -19,6 +19,7 @@
 #define _LOGCONFIG_H_
 
 #include <stdbool.h>
+#include <queued_entry.h>
 
 #define MAX_CONF_KEY_LEN   32
 #define MAX_CONF_VAL_LEN   256
@@ -58,8 +59,8 @@ int log_config_read_file(struct log_config *config, const char *filename);
 void log_config_free(struct log_config *config);
 void log_config_copy(struct log_config *dst, const struct log_config *src);
 void log_config_foreach(const struct log_config *config, configIter iter, void *userdata);
-enum dlogutil_sorting_order get_order_from_config(const struct log_config *conf);
-enum dlogutil_sorting_order get_proper_sort_by(enum dlogutil_sorting_order sort_by, bool is_pipe, const struct log_config *conf, bool *sorting_needed);
+dlogutil_sorting_order_e get_order_from_config(const struct log_config *conf);
+dlogutil_sorting_order_e get_proper_sort_by(dlogutil_sorting_order_e sort_by, bool is_pipe, const struct log_config *conf, bool *sorting_needed);
 
 #ifdef __cplusplus
 }

diff --git a/include/logprint.h b/include/logprint.h
index fdd8166..5bb353d 100644 (file)
--- a/include/logprint.h
+++ b/include/logprint.h
@@ -199,7 +199,7 @@ int log_print_log_line(
 log_priority filter_char_to_pri(char c);
 
 char filter_pri_to_char(log_priority pri);
-enum dlogutil_sorting_order get_format_sorting(log_print_format format);
+dlogutil_sorting_order_e get_format_sorting(log_print_format format);
 
 #ifdef __cplusplus
 }

diff --git a/include/logretrieve.h b/include/logretrieve.h
index 7c9c0b1..13afcaf 100644 (file)
--- a/include/logretrieve.h
+++ b/include/logretrieve.h
@@ -13,4 +13,4 @@ int additional_options_init(struct additional_options *opt);
 void additional_options_cleanup(struct additional_options *opt);
 
 int create_initial_fdis(struct fd_info ***fdis, int enabled_buffers, bool is_pipe, const struct log_config *conf);
-int do_print(struct fd_info **data_fds, int fd_count, dlogutil_write_cb callback, void *userdata, bool sorting_needed, enum dlogutil_sorting_order sort_by, const struct log_config *conf, struct additional_options *opt);
+int do_print(struct fd_info **data_fds, int fd_count, dlogutil_write_cb callback, void *userdata, bool sorting_needed, dlogutil_sorting_order_e sort_by, const struct log_config *conf, struct additional_options *opt);

diff --git a/include/queued_entry.h b/include/queued_entry.h
index 8a5e78c..2a4d3cc 100644 (file)
--- a/include/queued_entry.h
+++ b/include/queued_entry.h
@@ -27,14 +27,14 @@ struct log_config;
 /**
  * @brief sorting order
  */
-enum dlogutil_sorting_order {
+typedef enum dlogutil_sorting_order {
        DLOGUTIL_SORT_SENT_MONO = 0,
        DLOGUTIL_SORT_SENT_REAL,
        DLOGUTIL_SORT_RECV_MONO,
        DLOGUTIL_SORT_RECV_REAL,
        DLOGUTIL_SORT_MAX,
        DLOGUTIL_SORT_DEFAULT,
-};
+} dlogutil_sorting_order_e;
 
 
 enum {

diff --git a/include/queued_entry_timestamp.h b/include/queued_entry_timestamp.h
index b5a3a27..6b9d15f 100644 (file)
--- a/include/queued_entry_timestamp.h
+++ b/include/queued_entry_timestamp.h
@@ -22,14 +22,12 @@
 #include <stdbool.h>
 #include <time.h>
 #include <logconfig.h>
-
-struct dlogutil_entry;
-enum dlogutil_sorting_order;
+#include <queued_entry.h>
 
 void add_recv_timestamp(struct dlogutil_entry *le);
 void copy_recv_timestamp(struct dlogutil_entry *le);
-bool log_entry_is_earlier(const enum dlogutil_sorting_order sort_by, const struct dlogutil_entry *lhs, const struct dlogutil_entry *rhs);
-struct timespec dlogutil_entry_ts(const struct dlogutil_entry *le, enum dlogutil_sorting_order stamp_type);
-clockid_t get_proper_clock(enum dlogutil_sorting_order sort_by);
+bool log_entry_is_earlier(const dlogutil_sorting_order_e sort_by, const struct dlogutil_entry *lhs, const struct dlogutil_entry *rhs);
+struct timespec dlogutil_entry_ts(const struct dlogutil_entry *le, dlogutil_sorting_order_e stamp_type);
+clockid_t get_proper_clock(dlogutil_sorting_order_e sort_by);
 
 #endif /* _QUEUED_ENTRY_TIMESTAMP_H */

diff --git a/include/sort_vector.h b/include/sort_vector.h
index 70f1d6a..6fefd99 100644 (file)
--- a/include/sort_vector.h
+++ b/include/sort_vector.h
@@ -36,7 +36,7 @@ struct sort_vector {
        size_t size;
        long timeout;
        size_t dump;
-       enum dlogutil_sorting_order sort_by;
+       dlogutil_sorting_order_e sort_by;
        bool old_logs_dumped;
        struct timespec start;  /* mark start to detect the moment when all "old" logs (existing before util has been invoked) have been dumped */
 };

diff --git a/src/logger/log_storage.c b/src/logger/log_storage.c
index fb1f315..f8da07f 100644 (file)
--- a/src/logger/log_storage.c
+++ b/src/logger/log_storage.c
@@ -119,7 +119,7 @@ typedef struct log_storage_entry {
 
 struct log_storage {
        unsigned capacity;      // maximum size of stored logs
-       enum dlogutil_sorting_order sort_by; // stored logs sorting order
+       dlogutil_sorting_order_e sort_by; // stored logs sorting order
        uint64_t counter_begin; // "pointer" to the first stored log in the log stream, see description above
        uint64_t counter_end;   // "pointer" to the end of the stored log stream
        struct log_storage_entry *entries; // the log entries are stored here
@@ -143,7 +143,7 @@ struct log_storage_reader {
        uint64_t counter;                     // current position of the reader in the log stream
 };
 
-log_storage *log_storage_create(unsigned capacity, enum dlogutil_sorting_order sort_by)
+log_storage *log_storage_create(unsigned capacity, dlogutil_sorting_order_e sort_by)
 {
        log_storage *storage = malloc(sizeof(*storage));
        if (NULL != storage) {
@@ -348,7 +348,7 @@ void log_storage_clear(log_storage *storage)
                log_storage_remove_the_earliest_log(storage);
 }
 
-enum dlogutil_sorting_order log_storage_get_sorting_order(const log_storage *storage)
+dlogutil_sorting_order_e log_storage_get_sorting_order(const log_storage *storage)
 {
        assert(storage);
        return storage->sort_by;

diff --git a/src/logger/log_storage.h b/src/logger/log_storage.h
index 2dfaae6..7b21f52 100644 (file)
--- a/src/logger/log_storage.h
+++ b/src/logger/log_storage.h
@@ -43,7 +43,7 @@ typedef struct log_storage log_storage;
  * @param[in] capacity Maximum capacity of the created instance.
  * @return The created storage instance or NULL in case of lack of memory.
  */
-log_storage *log_storage_create(unsigned capacity, enum dlogutil_sorting_order sort_by);
+log_storage *log_storage_create(unsigned capacity, dlogutil_sorting_order_e sort_by);
 
 /**
  * @brief Frees the storage and all the resources associated with it.
@@ -64,7 +64,7 @@ unsigned log_storage_get_capacity(log_storage *storage);
  * @brief Returns the sorting order of the storage, as specified on the storage creation.
  * @return Log storage's sorting order.
  */
-enum dlogutil_sorting_order log_storage_get_sorting_order(const log_storage *storage);
+dlogutil_sorting_order_e log_storage_get_sorting_order(const log_storage *storage);
 
 /**
  * @brief This function adds a new entry to the storage.

diff --git a/src/logger/logger.c b/src/logger/logger.c
index ad4071a..731d877 100644 (file)
--- a/src/logger/logger.c
+++ b/src/logger/logger.c
@@ -2017,7 +2017,7 @@ int prepare_config_data(struct logger_config_data *data, int argc, char **argv)
        if (ret < 0)
                return ret;
 
-       const enum dlogutil_sorting_order sort_by = get_order_from_config(&conf);
+       const dlogutil_sorting_order_e sort_by = get_order_from_config(&conf);
 
        const char * const backend = log_config_get(&conf, "backend");
        if (!backend) {

diff --git a/src/logger/logger_internal.h b/src/logger/logger_internal.h
index fbe97d7..28a63f4 100644 (file)
--- a/src/logger/logger_internal.h
+++ b/src/logger/logger_internal.h
@@ -160,7 +160,7 @@ struct log_buffer {
        struct sock_data   sock_ctl;
        list_head          readers;
        log_id_t           id;
-       enum dlogutil_sorting_order sort_by;
+       dlogutil_sorting_order_e sort_by;
        log_storage       *log_storage;
 };
 
@@ -189,7 +189,7 @@ struct buffer_config_data {
        int size;
        struct socket_config_data write_socket;
        struct socket_config_data ctl_socket;
-       enum dlogutil_sorting_order sort_by;
+       dlogutil_sorting_order_e sort_by;
 };
 
 struct logger_config_data {

diff --git a/src/logutil/logutil.c b/src/logutil/logutil.c
index 15a64fc..4fe5b29 100644 (file)
--- a/src/logutil/logutil.c
+++ b/src/logutil/logutil.c
@@ -246,9 +246,9 @@ int main(int argc, char **argv)
        }
        const bool is_pipe = !strcmp(backend, "pipe");
 
-       enum dlogutil_sorting_order sort_by = get_format_sorting(l_file.format.format);
+       dlogutil_sorting_order_e sort_by = get_format_sorting(l_file.format.format);
        bool sorting_needed;
-       enum dlogutil_sorting_order proper_sort_by = get_proper_sort_by(sort_by, is_pipe, &conf, &sorting_needed);
+       dlogutil_sorting_order_e proper_sort_by = get_proper_sort_by(sort_by, is_pipe, &conf, &sorting_needed);
 
        r = l_file.path ? logfile_open(&l_file) : 0;
        if (r < 0) {

diff --git a/src/shared/log_file.c b/src/shared/log_file.c
index 458e9c2..2297b14 100644 (file)
--- a/src/shared/log_file.c
+++ b/src/shared/log_file.c
@@ -216,7 +216,7 @@ static void logfile_add_timestamp(struct log_file *file, struct timespec ts)
  * @param[in] file The file to write to
  * @returns 0 if log was successfully written, else 1
  */
-int logfile_write_with_rotation(const struct dlogutil_entry *e, struct log_file *file, enum dlogutil_sorting_order sort_by)
+int logfile_write_with_rotation(const struct dlogutil_entry *e, struct log_file *file, dlogutil_sorting_order_e sort_by)
 {
        if (file->colors_auto)
                file->format.color = file->isatty;

diff --git a/src/shared/logconfig.c b/src/shared/logconfig.c
index 1363511..9112e0c 100644 (file)
--- a/src/shared/logconfig.c
+++ b/src/shared/logconfig.c
@@ -384,9 +384,9 @@ void log_config_foreach(const struct log_config *config, configIter iter, void *
        }
 }
 
-enum dlogutil_sorting_order get_order_from_config(const struct log_config *conf)
+dlogutil_sorting_order_e get_order_from_config(const struct log_config *conf)
 {
-       enum dlogutil_sorting_order ret = DLOGUTIL_SORT_RECV_MONO;
+       dlogutil_sorting_order_e ret = DLOGUTIL_SORT_RECV_MONO;
 
        const char *const sort_str = log_config_get(conf, "sort_by");
        if (sort_str) {
@@ -401,9 +401,9 @@ enum dlogutil_sorting_order get_order_from_config(const struct log_config *conf)
        return ret;
 }
 
-enum dlogutil_sorting_order get_proper_sort_by(enum dlogutil_sorting_order sort_by, bool is_pipe, const struct log_config *conf, bool *sorting_needed)
+dlogutil_sorting_order_e get_proper_sort_by(dlogutil_sorting_order_e sort_by, bool is_pipe, const struct log_config *conf, bool *sorting_needed)
 {
-       enum dlogutil_sorting_order source_sorting = get_order_from_config(conf);
+       dlogutil_sorting_order_e source_sorting = get_order_from_config(conf);
 
        *sorting_needed = false;
 

diff --git a/src/shared/logprint.c b/src/shared/logprint.c
index 1964674..f1c86be 100644 (file)
--- a/src/shared/logprint.c
+++ b/src/shared/logprint.c
@@ -570,7 +570,7 @@ const char* dlogutil_entry_msg(const struct dlogutil_entry *entry)
        return entry->msg + entry->tag_len + 1 /* NULL delimiter */;
 }
 
-enum dlogutil_sorting_order get_format_sorting(log_print_format format)
+dlogutil_sorting_order_e get_format_sorting(log_print_format format)
 {
        switch (format) {
        case FORMAT_TAG:

diff --git a/src/shared/logretrieve.c b/src/shared/logretrieve.c
index 522adf8..65e8589 100644 (file)
--- a/src/shared/logretrieve.c
+++ b/src/shared/logretrieve.c
@@ -100,7 +100,7 @@ void additional_options_cleanup(struct additional_options *opt)
        log_filter_free(opt->filter_object);
 }
 
-struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, enum dlogutil_sorting_order sort_by)
+struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, dlogutil_sorting_order_e sort_by)
 {
        assert(data_fds);
 
@@ -154,7 +154,7 @@ int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, stru
  * @param[in] l_file File output metadata
  * @return int 0 if successful, a negative value on error, callback's return value if it isn't 0
  */
-int do_print(struct fd_info **data_fds, int fd_count, dlogutil_write_cb callback, void *userdata, bool sorting_needed, enum dlogutil_sorting_order sort_by, const struct log_config *conf, struct additional_options *opt)
+int do_print(struct fd_info **data_fds, int fd_count, dlogutil_write_cb callback, void *userdata, bool sorting_needed, dlogutil_sorting_order_e sort_by, const struct log_config *conf, struct additional_options *opt)
 {
        assert(data_fds);
        assert(conf);

diff --git a/src/shared/queued_entry_timestamp.c b/src/shared/queued_entry_timestamp.c
index 4c05b93..6256485 100644 (file)
--- a/src/shared/queued_entry_timestamp.c
+++ b/src/shared/queued_entry_timestamp.c
@@ -54,7 +54,7 @@ void copy_recv_timestamp(struct dlogutil_entry *le)
        le->nsec_recv_real = le->nsec_sent_real;
 }
 
-bool log_entry_is_earlier(const enum dlogutil_sorting_order sort_by, const struct dlogutil_entry *lhs, const struct dlogutil_entry *rhs)
+bool log_entry_is_earlier(const dlogutil_sorting_order_e sort_by, const struct dlogutil_entry *lhs, const struct dlogutil_entry *rhs)
 {
        assert(lhs);
        assert(rhs);
@@ -95,7 +95,7 @@ bool log_entry_is_earlier(const enum dlogutil_sorting_order sort_by, const struc
        return l_sec < r_sec || (l_sec == r_sec && l_nsec < r_nsec);
 }
 
-struct timespec dlogutil_entry_ts(const struct dlogutil_entry *le, enum dlogutil_sorting_order stamp_type)
+struct timespec dlogutil_entry_ts(const struct dlogutil_entry *le, dlogutil_sorting_order_e stamp_type)
 {
        assert(le);
 
@@ -125,7 +125,7 @@ struct timespec dlogutil_entry_ts(const struct dlogutil_entry *le, enum dlogutil
        return ret;
 }
 
-clockid_t get_proper_clock(enum dlogutil_sorting_order sort_by)
+clockid_t get_proper_clock(dlogutil_sorting_order_e sort_by)
 {
        switch (sort_by) {
        case DLOGUTIL_SORT_SENT_MONO:

diff --git a/src/shared/sort_vector.c b/src/shared/sort_vector.c
index b877727..2def691 100644 (file)
--- a/src/shared/sort_vector.c
+++ b/src/shared/sort_vector.c
@@ -223,7 +223,7 @@ long sort_vector_time_span(struct sort_vector *logs)
  * @param[out] callback_ret Return value of the callback if it has been called
  * @return bool whether the log was old enough
  */
-bool process_log(const struct dlogutil_entry *e, struct timespec reference_ts, enum dlogutil_sorting_order stamp_type, dlogutil_write_cb callback, void *userdata, long timeout, int *callback_ret)
+bool process_log(const struct dlogutil_entry *e, struct timespec reference_ts, dlogutil_sorting_order_e stamp_type, dlogutil_write_cb callback, void *userdata, long timeout, int *callback_ret)
 {
        assert(e);
        assert(callback_ret);

diff --git a/src/tests/fd_info.c b/src/tests/fd_info.c
index f804570..1570dc6 100644 (file)
--- a/src/tests/fd_info.c
+++ b/src/tests/fd_info.c
@@ -65,7 +65,7 @@ struct dlogutil_entry *test_extract(struct fd_info *fdi)
        return fail_extract ? NULL : (struct dlogutil_entry *) 0xBADFEEL;
 }
 
-struct timespec __wrap_dlogutil_entry_ts(const struct dlogutil_entry *le, enum dlogutil_sorting_order stamp_type)
+struct timespec __wrap_dlogutil_entry_ts(const struct dlogutil_entry *le, dlogutil_sorting_order_e stamp_type)
 {
        assert(le == (struct dlogutil_entry *)0xBADFEEL);
        return (struct timespec) {

diff --git a/src/tests/log_file.c b/src/tests/log_file.c
index ee6ae11..ff2db4b 100644 (file)
--- a/src/tests/log_file.c
+++ b/src/tests/log_file.c
@@ -34,7 +34,7 @@ int __wrap_rename(const char *oldpath, const char *newpath)
        return -1;
 }
 
-struct timespec __wrap_dlogutil_entry_ts(const struct dlogutil_entry *le, enum dlogutil_sorting_order stamp_type)
+struct timespec __wrap_dlogutil_entry_ts(const struct dlogutil_entry *le, dlogutil_sorting_order_e stamp_type)
 {
        assert(stamp_type == DLOGUTIL_SORT_SENT_MONO);
        assert(le == (struct dlogutil_entry *) 0xBA5EBALL);

diff --git a/src/tests/logprint.c b/src/tests/logprint.c
index 7d62bda..7542aca 100644 (file)
--- a/src/tests/logprint.c
+++ b/src/tests/logprint.c
@@ -593,7 +593,7 @@ void check_get_format_sorting()
 {
        static const struct {
                log_print_format format;
-               enum dlogutil_sorting_order sorting;
+               dlogutil_sorting_order_e sorting;
        } expected_sorting[] = {
                {FORMAT_TAG          , DLOGUTIL_SORT_DEFAULT  },
                {FORMAT_PROCESS      , DLOGUTIL_SORT_DEFAULT  },

diff --git a/src/tests/logutil.c b/src/tests/logutil.c
index 3390e22..80812e6 100644 (file)
--- a/src/tests/logutil.c
+++ b/src/tests/logutil.c
@@ -6,8 +6,8 @@
 #include <sort_vector.h>
 #include <fd_info.h>
 
-bool process_log(const struct dlogutil_entry *e, struct timespec reference_ts, enum dlogutil_sorting_order stamp_type, dlogutil_write_cb callback, void *userdata, long timeout, int *callback_ret);
-struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, enum dlogutil_sorting_order sort_by);
+bool process_log(const struct dlogutil_entry *e, struct timespec reference_ts, dlogutil_sorting_order_e stamp_type, dlogutil_write_cb callback, void *userdata, long timeout, int *callback_ret);
+struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, dlogutil_sorting_order_e sort_by);
 int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, dlogutil_write_cb callback, void *userdata, dlogutil_filter_options_s *filter);
 int validate_buffers(int *enabled_buffers);
 

diff --git a/src/tests/queued_entry.c b/src/tests/queued_entry.c
index 3d8132c..30fddea 100644 (file)
--- a/src/tests/queued_entry.c
+++ b/src/tests/queued_entry.c
@@ -35,7 +35,7 @@ int main()
        struct log_config conf = {NULL, NULL};
        const struct {
                const char *const str;
-               enum dlogutil_sorting_order order;
+               dlogutil_sorting_order_e order;
        } ordering[] = {
                { "sent_real", DLOGUTIL_SORT_SENT_REAL },
                { "sent_mono", DLOGUTIL_SORT_SENT_MONO },

diff --git a/src/tests/sort_vector.c b/src/tests/sort_vector.c
index 4649a91..dadb158 100644 (file)
--- a/src/tests/sort_vector.c
+++ b/src/tests/sort_vector.c
@@ -14,7 +14,7 @@ int callback(const struct dlogutil_entry *e, void *userdata)
        return callback_ret;
 }
 
-bool __wrap_log_entry_is_earlier(const enum dlogutil_sorting_order sort_by, const struct dlogutil_entry *lhs, const struct dlogutil_entry *rhs)
+bool __wrap_log_entry_is_earlier(const dlogutil_sorting_order_e sort_by, const struct dlogutil_entry *lhs, const struct dlogutil_entry *rhs)
 {
        return lhs < rhs;
 }