queued_entry : merge exactly same functions

Change-Id: Ia015d6c3d74cb07083a6f173ad42b3c69054667d
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/include/queued_entry.h b/include/queued_entry.h
index 8e9c50c..6738bd5 100644 (file)
--- a/include/queued_entry.h
+++ b/include/queued_entry.h
@@ -46,11 +46,8 @@ struct queued_entry_t {
 struct queued_entry_t* new_queued_entry(uint32_t log_read_size_max);
 void free_queued_entry(struct queued_entry_t* entry);
 void free_queued_entry_list(struct queued_entry_t *queue);
-int read_queued_entry_from_dev(int fd, struct queued_entry_t *entry,
-                              uint32_t log_read_size_max);
-struct queued_entry_t* pop_queued_entry(struct queued_entry_t** queue);
+int read_queued_entry_from_dev(int fd, struct queued_entry_t *entry, uint32_t log_read_size_max);
 int cmp(struct queued_entry_t* a, struct queued_entry_t* b);
-void enqueue(struct queued_entry_t** queue, struct queued_entry_t* entry);
 
 #else
 
@@ -78,9 +75,7 @@ struct queued_entry_t* new_queued_entry(uint32_t for_compatibility);
 void free_queued_entry(struct queued_entry_t* entry);
 void free_queued_entry_list(struct queued_entry_t *queue);
 int read_queued_entry_from_dev(int fd, struct queued_entry_t *entry, uint32_t for_compatibility);
-struct queued_entry_t* pop_queued_entry(struct queued_entry_t** queue);
 int cmp(struct queued_entry_t* a, struct queued_entry_t* b);
-void enqueue(struct queued_entry_t** queue, struct queued_entry_t* entry);
 
 #endif
 
@@ -91,4 +86,7 @@ void enqueue(struct queued_entry_t** queue, struct queued_entry_t* entry);
 #define RQER_EPIPE     4
 //TODO: consider enum
 
+struct queued_entry_t* pop_queued_entry(struct queued_entry_t** queue);
+void enqueue(struct queued_entry_t** queue, struct queued_entry_t* entry);
+
 #endif /* _QUEUED_ENTRY_H */

diff --git a/src/shared/queued_entry.c b/src/shared/queued_entry.c
index ada8088..fa2438f 100644 (file)
--- a/src/shared/queued_entry.c
+++ b/src/shared/queued_entry.c
@@ -172,13 +172,6 @@ int read_queued_entry_from_dev(int fd, struct queued_entry_t *entry,
        return RQER_SUCCESS;
 }
 
-struct queued_entry_t* pop_queued_entry(struct queued_entry_t** queue)
-{
-       struct queued_entry_t *entry = *queue;
-       *queue = (*queue)->next;
-       return entry;
-}
-
 int cmp(struct queued_entry_t* a, struct queued_entry_t* b)
 {
        if (a->entry.ts_usec < b->entry.ts_usec)
@@ -188,20 +181,6 @@ int cmp(struct queued_entry_t* a, struct queued_entry_t* b)
        return 0;
 }
 
-void enqueue(struct queued_entry_t** queue, struct queued_entry_t* entry)
-{
-       if (*queue == NULL) {
-               *queue = entry;
-       } else {
-               struct queued_entry_t** e = queue;
-               while (*e && cmp(entry, *e) >= 0 ) {
-                       e = &((*e)->next);
-               }
-               entry->next = *e;
-               *e = entry;
-       }
-}
-
 #else
 
 struct queued_entry_t* new_queued_entry(uint32_t for_compatibility)
@@ -257,13 +236,6 @@ int read_queued_entry_from_dev(int fd, struct queued_entry_t *entry, uint32_t fo
        return 0;
 }
 
-struct queued_entry_t* pop_queued_entry(struct queued_entry_t** queue)
-{
-       struct queued_entry_t *entry = *queue;
-       *queue = (*queue)->next;
-       return entry;
-}
-
 int cmp(struct queued_entry_t* a, struct queued_entry_t* b)
 {
        int n = a->entry.sec - b->entry.sec;
@@ -273,6 +245,15 @@ int cmp(struct queued_entry_t* a, struct queued_entry_t* b)
        return a->entry.nsec - b->entry.nsec;
 }
 
+#endif
+
+struct queued_entry_t* pop_queued_entry(struct queued_entry_t** queue)
+{
+       struct queued_entry_t *entry = *queue;
+       *queue = (*queue)->next;
+       return entry;
+}
+
 void enqueue(struct queued_entry_t** queue, struct queued_entry_t* entry)
 {
        if (*queue == NULL) {
@@ -287,4 +268,3 @@ void enqueue(struct queued_entry_t** queue, struct queued_entry_t* entry)
        }
 }
 
-#endif