cosmetic changes

flow/PacketPassFairQueue.c

@@ -58,7 +58,7 @@ static uint64_t get_current_time (PacketPassFairQueue *m)
     uint64_t time;
     int have = 0;
     
-    PacketPassFairQueueFlow *first_flow = PacketPassFairQueue_Tree_GetFirst(&m->queued_tree, 0);
+    PacketPassFairQueueFlow *first_flow = PacketPassFairQueue__Tree_GetFirst(&m->queued_tree, 0);
     if (first_flow) {
         ASSERT(first_flow->is_queued)
         
@@ -88,7 +88,7 @@ static void increment_sent_flow (PacketPassFairQueueFlow *flow, uint64_t amount)
     if (amount > FAIRQUEUE_MAX_TIME - flow->time) {
         // get time to subtract
         uint64_t subtract;
-        PacketPassFairQueueFlow *first_flow = PacketPassFairQueue_Tree_GetFirst(&m->queued_tree, 0);
+        PacketPassFairQueueFlow *first_flow = PacketPassFairQueue__Tree_GetFirst(&m->queued_tree, 0);
         if (!first_flow) {
             subtract = flow->time;
         } else {
@@ -123,14 +123,14 @@ static void schedule (PacketPassFairQueue *m)
     ASSERT(!m->sending_flow)
     ASSERT(!m->previous_flow)
     ASSERT(!m->freeing)
-    ASSERT(!PacketPassFairQueue_Tree_IsEmpty(&m->queued_tree))
+    ASSERT(!PacketPassFairQueue__Tree_IsEmpty(&m->queued_tree))
     
     // get first queued flow
-    PacketPassFairQueueFlow *qflow = PacketPassFairQueue_Tree_GetFirst(&m->queued_tree, 0);
+    PacketPassFairQueueFlow *qflow = PacketPassFairQueue__Tree_GetFirst(&m->queued_tree, 0);
     ASSERT(qflow->is_queued)
     
     // remove flow from queue
-    PacketPassFairQueue_Tree_Remove(&m->queued_tree, 0, qflow);
+    PacketPassFairQueue__Tree_Remove(&m->queued_tree, 0, qflow);
     qflow->is_queued = 0;
     
     // schedule send
@@ -148,7 +148,7 @@ static void schedule_job_handler (PacketPassFairQueue *m)
     // remove previous flow
     m->previous_flow = NULL;
     
-    if (!PacketPassFairQueue_Tree_IsEmpty(&m->queued_tree)) {
+    if (!PacketPassFairQueue__Tree_IsEmpty(&m->queued_tree)) {
         schedule(m);
     }
 }
@@ -173,7 +173,7 @@ static void input_handler_send (PacketPassFairQueueFlow *flow, uint8_t *data, in
     // queue flow
     flow->queued.data = data;
     flow->queued.data_len = data_len;
-    int res = PacketPassFairQueue_Tree_Insert(&m->queued_tree, 0, flow, NULL);
+    int res = PacketPassFairQueue__Tree_Insert(&m->queued_tree, 0, flow, NULL);
     ASSERT(res)
     flow->is_queued = 1;
     
@@ -249,7 +249,7 @@ int PacketPassFairQueue_Init (PacketPassFairQueue *m, PacketPassInterface *outpu
     m->previous_flow = NULL;
     
     // init queued tree
-    PacketPassFairQueue_Tree_Init(&m->queued_tree);
+    PacketPassFairQueue__Tree_Init(&m->queued_tree);
     
     // init flows list
     LinkedList2_Init(&m->flows_list);
@@ -271,7 +271,7 @@ fail0:
 void PacketPassFairQueue_Free (PacketPassFairQueue *m)
 {
     ASSERT(LinkedList2_IsEmpty(&m->flows_list))
-    ASSERT(PacketPassFairQueue_Tree_IsEmpty(&m->queued_tree))
+    ASSERT(PacketPassFairQueue__Tree_IsEmpty(&m->queued_tree))
     ASSERT(!m->previous_flow)
     ASSERT(!m->sending_flow)
     DebugCounter_Free(&m->d_ctr);
@@ -343,7 +343,7 @@ void PacketPassFairQueueFlow_Free (PacketPassFairQueueFlow *flow)
     
     // remove from queue
     if (flow->is_queued) {
-        PacketPassFairQueue_Tree_Remove(&m->queued_tree, 0, flow);
+        PacketPassFairQueue__Tree_Remove(&m->queued_tree, 0, flow);
     }
     
     // remove from flows list

flow/PacketPassFairQueue.h

@@ -63,7 +63,7 @@ typedef struct PacketPassFairQueueFlow_s {
     LinkedList2Node list_node;
     int is_queued;
     struct {
-        PacketPassFairQueue_TreeNode tree_node;
+        PacketPassFairQueue__TreeNode tree_node;
         uint8_t *data;
         int data_len;
     } queued;
@@ -81,7 +81,7 @@ typedef struct PacketPassFairQueue_s {
     struct PacketPassFairQueueFlow_s *sending_flow;
     int sending_len;
     struct PacketPassFairQueueFlow_s *previous_flow;
-    PacketPassFairQueue_Tree queued_tree;
+    PacketPassFairQueue__Tree queued_tree;
     LinkedList2 flows_list;
     int freeing;
     BPending schedule_job;

flow/PacketPassFairQueue_tree.h

@@ -1,4 +1,4 @@
-#define SAVL_PARAM_NAME PacketPassFairQueue_Tree
+#define SAVL_PARAM_NAME PacketPassFairQueue__Tree
 #define SAVL_PARAM_FEATURE_COUNTS 0
 #define SAVL_PARAM_FEATURE_NOKEYS 1
 #define SAVL_PARAM_TYPE_ENTRY struct PacketPassFairQueueFlow_s