Rename dlogutil_write_callback

Change-Id: Idfefbd7ab4e634dbb0f0a2470e1448db1a80c212

diff --git a/include/fd_info.h b/include/fd_info.h
index 1566551..cd5b354 100644 (file)
--- a/include/fd_info.h
+++ b/include/fd_info.h
@@ -70,6 +70,6 @@ struct fd_info *fdi_create(struct fd_ops *ops, const char *name);
 void fdi_free(struct fd_info *fdi);
 void fdi_array_free(struct fd_info ***arr);
 bool fdi_has_log(struct fd_info *fdi);
-int fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, struct dlogutil_filter_options *filter);
+int fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_cb callback, void *userdata, struct dlogutil_filter_options *filter);
 struct dlogutil_entry *fdi_extract_entry(struct fd_info *fdi);
 int fdi_read(struct fd_info *fdi);

diff --git a/include/log_file.h b/include/log_file.h
index 24a7f31..c8ce41b 100644 (file)
--- a/include/log_file.h
+++ b/include/log_file.h
@@ -57,7 +57,7 @@ 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);
 
-typedef int dlogutil_write_callback(const struct dlogutil_entry *e, void *userdata);
+typedef int dlogutil_write_cb(const struct dlogutil_entry *e, void *userdata);
 
 struct logfile_callback_data
 {

diff --git a/include/logretrieve.h b/include/logretrieve.h
index ed1daa8..079de8a 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_callback 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, enum dlogutil_sorting_order sort_by, const struct log_config *conf, struct additional_options *opt);

diff --git a/include/sort_vector.h b/include/sort_vector.h
index 5cc355f..70f1d6a 100644 (file)
--- a/include/sort_vector.h
+++ b/include/sort_vector.h
@@ -51,6 +51,6 @@ int sort_vector_full(struct sort_vector *logs);
 int sort_vector_used_size(struct sort_vector *logs);
 void sort_vector_pop(struct sort_vector *logs);
 void sort_vector_apply_config(struct sort_vector *logs, const struct log_config *config);
-int sort_vector_push(struct sort_vector *logs, struct dlogutil_entry *p, dlogutil_write_callback callback, void *userdata);
+int sort_vector_push(struct sort_vector *logs, struct dlogutil_entry *p, dlogutil_write_cb callback, void *userdata);
 long sort_vector_time_span(struct sort_vector *logs);
-int sort_vector_flush(struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, bool force);
+int sort_vector_flush(struct sort_vector *logs, dlogutil_write_cb callback, void *userdata, bool force);

diff --git a/src/shared/fd_info.c b/src/shared/fd_info.c
index 09232fa..9427cec 100644 (file)
--- a/src/shared/fd_info.c
+++ b/src/shared/fd_info.c
@@ -76,7 +76,7 @@ void fdi_array_free(struct fd_info ***arr)
        free(*arr);
 }
 
-int fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, struct dlogutil_filter_options *filter)
+int fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_cb callback, void *userdata, struct dlogutil_filter_options *filter)
 {
        assert(fdi);
        assert(logs);

diff --git a/src/shared/logretrieve.c b/src/shared/logretrieve.c
index 48bfccc..29cde99 100644 (file)
--- a/src/shared/logretrieve.c
+++ b/src/shared/logretrieve.c
@@ -125,7 +125,7 @@ struct fd_info *find_earliest_log(struct fd_info **data_fds, int fd_count, enum
        return best_fdi;
 }
 
-int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, struct dlogutil_filter_options *filter)
+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, struct dlogutil_filter_options *filter)
 {
        assert(data_fds);
        assert(logs);
@@ -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_callback 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, enum dlogutil_sorting_order sort_by, const struct log_config *conf, struct additional_options *opt)
 {
        assert(data_fds);
        assert(conf);

diff --git a/src/shared/sort_vector.c b/src/shared/sort_vector.c
index 3dcc89f..b877727 100644 (file)
--- a/src/shared/sort_vector.c
+++ b/src/shared/sort_vector.c
@@ -114,7 +114,7 @@ int sort_vector_used_size(struct sort_vector *logs)
  * @param[in] logs Log sorting vector
  * @return 0 on success, -errno on failure
  */
-int sort_vector_push(struct sort_vector *logs, struct dlogutil_entry *p, dlogutil_write_callback callback, void *userdata)
+int sort_vector_push(struct sort_vector *logs, struct dlogutil_entry *p, dlogutil_write_cb callback, void *userdata)
 {
        assert(logs);
        assert(logs->data);
@@ -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_callback callback, void *userdata, long timeout, int *callback_ret)
+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)
 {
        assert(e);
        assert(callback_ret);
@@ -247,7 +247,7 @@ bool process_log(const struct dlogutil_entry *e, struct timespec reference_ts, e
        return true;
 }
 
-int sort_vector_flush(struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, bool force)
+int sort_vector_flush(struct sort_vector *logs, dlogutil_write_cb callback, void *userdata, bool force)
 {
        struct timespec ts;
        clock_gettime(get_proper_clock(logs->sort_by), &ts);

diff --git a/src/tests/fd_info.c b/src/tests/fd_info.c
index dbd159f..a5d3729 100644 (file)
--- a/src/tests/fd_info.c
+++ b/src/tests/fd_info.c
@@ -46,7 +46,7 @@ int callback(const struct dlogutil_entry *entry, void *userdata)
 
 static bool sv_pushed;
 static int sv_push_retval;
-int __wrap_sort_vector_push(struct sort_vector *logs, struct dlogutil_entry *p, dlogutil_write_callback comp_callback, void *userdata)
+int __wrap_sort_vector_push(struct sort_vector *logs, struct dlogutil_entry *p, dlogutil_write_cb comp_callback, void *userdata)
 {
        assert(p == (struct dlogutil_entry *) 0xBADFEEL);
        assert(comp_callback == callback);

diff --git a/src/tests/logutil.c b/src/tests/logutil.c
index 9fa6845..286b017 100644 (file)
--- a/src/tests/logutil.c
+++ b/src/tests/logutil.c
@@ -6,9 +6,9 @@
 #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_callback callback, void *userdata, long timeout, int *callback_ret);
+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);
-int put_logs_into_vector(struct fd_info **data_fds, int fd_count, int nfds, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, struct dlogutil_filter_options *filter);
+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, struct dlogutil_filter_options *filter);
 int validate_buffers(int *enabled_buffers);
 
 int written_logs = 0;
@@ -57,7 +57,7 @@ const struct dlogutil_entry *test_peek_entry(const struct fd_info *fdi)
 }
 
 int fdi_push_log_ret = 0;
-int __wrap_fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_callback callback, void *userdata, struct dlogutil_filter_options *filter)
+int __wrap_fdi_push_log(struct fd_info *fdi, struct sort_vector *logs, dlogutil_write_cb callback, void *userdata, struct dlogutil_filter_options *filter)
 {
        assert(filter == (struct dlogutil_filter_options *)0xEEE);
        if (fdi_push_log_ret != 0)