X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=ipfw%2Fdummynet.c;h=e2c5ff142f7bd4ce0ef981fc98be58523406ddfa;hb=6c2e192c3237bd46db6ad4230fed71d28f362331;hp=fd8fc4d30790c0cf61cf394a54eb3f0718585475;hpb=1c3dc9f45532c25adc21f297422f0f5a7420b8ca;p=ipfw.git

diff --git a/ipfw/dummynet.c b/ipfw/dummynet.c
index fd8fc4d..e2c5ff1 100644
--- a/ipfw/dummynet.c
+++ b/ipfw/dummynet.c
@@ -74,8 +74,12 @@ static struct _s_x dummynet_params[] = {
 	{ NULL, 0 }	/* terminator */
 };
 
+/*
+ * XXX to be updated to the new version,
+ * without the global struct command_opts variable
+ */
 static int
-sort_q(const void *pa, const void *pb)
+sort_q(void * to_be_done, const void *pa, const void *pb)
 {
 	int rev = (co.do_sort < 0);
 	int field = rev ? -co.do_sort : co.do_sort;
@@ -118,7 +122,7 @@ list_queues(struct dn_flow_set *fs, struct dn_flow_queue *q)
 		return;
 
 	if (co.do_sort != 0)
-		heapsort(q, fs->rq_elements, sizeof *q, sort_q);
+		qsort_r(q, fs->rq_elements, sizeof *q, NULL, sort_q);
 
 	/* Print IPv4 flows */
 	index_printed = 0;
@@ -477,7 +481,7 @@ is_valid_number(const char *s)
  * and return the numeric bandwidth value.
  * set clocking interface or bandwidth value
  */
-void
+static void
 read_bandwidth(char *arg, int *bandwidth, char *if_name, int namelen)
 {
 	if (*bandwidth != -1)
@@ -521,7 +525,7 @@ struct point {
 	double delay;
 };
 
-int
+static int
 compare_points(const void *vp1, const void *vp2)
 {
 	const struct point *p1 = vp1;