Update the work on ipfw tables, reduce diffs.

[ipfw.git] / ipfw / dummynet.c

diff --git a/ipfw/dummynet.c b/ipfw/dummynet.c
index 12625fe..6cfbff0 100644 (file)
--- a/ipfw/dummynet.c
+++ b/ipfw/dummynet.c
@@ -32,6 +32,7 @@
 
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -75,12 +76,8 @@ 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(void * to_be_done, const void *pa, const void *pb)
+sort_q(void *arg, const void *pa, const void *pb)
 {
        int rev = (co.do_sort < 0);
        int field = rev ? -co.do_sort : co.do_sort;
@@ -458,7 +455,6 @@ ipfw_delete_pipe(int pipe_or_queue, int i)
  *
  */
 
-/* XXX move to an array definition ? */
 #define ED_MAX_LINE_LEN        256+ED_MAX_NAME_LEN
 #define ED_TOK_SAMPLES "samples"
 #define ED_TOK_LOSS    "loss-level"