Generalize the doubly linked List sort function

3 files changed, 8 insertions, 6 deletions

diff --git a/list.c b/list.c
index 5a1f2e1..71d03f3 100644
--- a/list.c
+++ b/list.c
@@ -203,18 +203,20 @@ ll_partition(ll_node_t * l, ll_node_t * h, int (*comp)(void *, void *),
     {
       i = (i == NULL) ? l : i->next;
 
-      swap(i->data, j->data);
+      swap(&(i->data), &(j->data));
     }
   }
 
   i = (i == NULL) ? l : i->next;
-  swap(i->data, h->data);
+  swap(&(i->data), &(h->data));
 
   return i;
 }
 
 /* ======================================================== */
 /* A recursive implementation of quicksort for linked list. */
+/* Based on code found here:                                */
+/* http://www.geeksforgeeks.org/quicksort-for-linked-list   */
 /* ======================================================== */
 void
 ll_quicksort(ll_node_t * l, ll_node_t * h, int (*comp)(void *, void *),
diff --git a/smenu.c b/smenu.c
index d468653..3a19244 100644
--- a/smenu.c
+++ b/smenu.c
@@ -822,8 +822,8 @@ tag_comp(void * a, void * b)
 void
 tag_swap(void * a, void * b)
 {
-  output_t * oa = (output_t *)a;
-  output_t * ob = (output_t *)b;
+  output_t * oa = *(output_t **)a;
+  output_t * ob = *(output_t **)b;
   char *     tmp_str;
   long       tmp_order;
 
diff --git a/utils.c b/utils.c
index f62cbf2..5b384c4 100644
--- a/utils.c
+++ b/utils.c
@@ -69,8 +69,8 @@ interval_comp(void * a, void * b)
 void
 interval_swap(void * a, void * b)
 {
-  interval_t * ia = (interval_t *)a;
-  interval_t * ib = (interval_t *)b;
+  interval_t * ia = *(interval_t **)a;
+  interval_t * ib = *(interval_t **)b;
   long         tmp;
 
   tmp     = ia->low;