From a19119f96281afe95900a54a7361f88a3e9b9fc8 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Fri, 5 May 2023 08:09:08 +0800
Subject: [PATCH] sorted_queue_pop_all rename to sorted_queue_pop_to_chain

---
 src/sorted_queue.c            |  5 +++--
 src/sorted_queue.h            | 13 +++++++------
 src/tests/test_sorted_queue.c | 10 +++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/sorted_queue.c b/src/sorted_queue.c
index 33476b6..67389b6 100644
--- a/src/sorted_queue.c
+++ b/src/sorted_queue.c
@@ -111,8 +111,9 @@ void *sorted_queue_pop_ex(struct sorted_queue *sq,
     return data;
 }
 
-void sorted_queue_pop_all_ex(struct sorted_queue *sq, void *less_equal,
-        struct fc_list_head *head, const bool blocked)
+void sorted_queue_pop_to_chain_ex(struct sorted_queue *sq,
+        void *less_equal, struct fc_list_head *head,
+        const bool blocked)
 {
     struct fc_list_head *current;
 
diff --git a/src/sorted_queue.h b/src/sorted_queue.h
index 29a487f..9fb0cf8 100644
--- a/src/sorted_queue.h
+++ b/src/sorted_queue.h
@@ -87,14 +87,15 @@ void *sorted_queue_pop_ex(struct sorted_queue *sq,
 #define sorted_queue_try_pop(sq, less_equal) \
     sorted_queue_pop_ex(sq, less_equal, false)
 
-void sorted_queue_pop_all_ex(struct sorted_queue *sq, void *less_equal,
-        struct fc_list_head *head, const bool blocked);
+void sorted_queue_pop_to_chain_ex(struct sorted_queue *sq,
+        void *less_equal, struct fc_list_head *head,
+        const bool blocked);
 
-#define sorted_queue_pop_all(sq, less_equal, head) \
-    sorted_queue_pop_all_ex(sq, less_equal, head, true)
+#define sorted_queue_pop_to_chain(sq, less_equal, head) \
+    sorted_queue_pop_to_chain_ex(sq, less_equal, head, true)
 
-#define sorted_queue_try_pop_all(sq, less_equal, head) \
-    sorted_queue_pop_all_ex(sq, less_equal, head, false)
+#define sorted_queue_try_pop_to_chain(sq, less_equal, head) \
+    sorted_queue_pop_to_chain_ex(sq, less_equal, head, false)
 
 static inline bool sorted_queue_empty(struct sorted_queue *sq)
 {
diff --git a/src/tests/test_sorted_queue.c b/src/tests/test_sorted_queue.c
index c4eba9c..29c5952 100644
--- a/src/tests/test_sorted_queue.c
+++ b/src/tests/test_sorted_queue.c
@@ -77,7 +77,7 @@ static void test1()
     }
 
     less_equal.n = COUNT;
-    sorted_queue_try_pop_all(&sq, &less_equal, &head);
+    sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
     assert(sorted_queue_empty(&sq));
 
     i = 0;
@@ -90,7 +90,7 @@ static void test1()
     }
     assert(i == COUNT);
 
-    sorted_queue_try_pop_all(&sq, &less_equal, &head);
+    sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
     assert(fc_list_empty(&head));
 }
 
@@ -109,11 +109,11 @@ static void test2()
     }
 
     less_equal.n = 0;
-    sorted_queue_try_pop_all(&sq, &less_equal, &head);
+    sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
     assert(fc_list_empty(&head));
 
     less_equal.n = COUNT;
-    sorted_queue_try_pop_all(&sq, &less_equal, &head);
+    sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
     assert(!sorted_queue_empty(&sq));
 
     i = 0;
@@ -126,7 +126,7 @@ static void test2()
     }
 
     less_equal.n = 2 * COUNT + 1;
-    sorted_queue_try_pop_all(&sq, &less_equal, &head);
+    sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
     assert(sorted_queue_empty(&sq));
     fc_list_for_each_entry (number, &head, dlink) {
         n = i++ * MULTIPLE + 1;