Remove old line counting while dumping

19 files changed, 20 insertions, 20 deletions

diff --git a/src/genl-ctrl-list.c b/src/genl-ctrl-list.c
index 335c62b..5276779 100644
--- a/src/genl-ctrl-list.c
+++ b/src/genl-ctrl-list.c
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
 	struct nl_sock *sock;
 	struct nl_cache *family_cache;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
  
diff --git a/src/nf-ct-list.c b/src/nf-ct-list.c
index 2f4c4fc..c751c11 100644
--- a/src/nf-ct-list.c
+++ b/src/nf-ct-list.c
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 	struct nl_cache *ct_cache;
 	struct nfnl_ct *ct;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
  
diff --git a/src/nl-addr-add.c b/src/nl-addr-add.c
index 6ef85fb..207989a 100644
--- a/src/nl-addr-add.c
+++ b/src/nl-addr-add.c
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 	struct rtnl_addr *addr;
 	struct nl_cache *link_cache;
 	struct nl_dump_params dp = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 	int err;
diff --git a/src/nl-addr-delete.c b/src/nl-addr-delete.c
index 6d5abe1..e7cb0a9 100644
--- a/src/nl-addr-delete.c
+++ b/src/nl-addr-delete.c
@@ -43,7 +43,7 @@ static void delete_cb(struct nl_object *obj, void *arg)
 {
 	struct rtnl_addr *addr = nl_object_priv(obj);
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 	int err;
diff --git a/src/nl-addr-list.c b/src/nl-addr-list.c
index 6978f20..7c7806d 100644
--- a/src/nl-addr-list.c
+++ b/src/nl-addr-list.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
 	struct rtnl_addr *addr;
 	struct nl_cache *link_cache, *addr_cache;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 
diff --git a/src/nl-fib-lookup.c b/src/nl-fib-lookup.c
index 2507be8..c514211 100644
--- a/src/nl-fib-lookup.c
+++ b/src/nl-fib-lookup.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
 	struct nl_addr *addr;
 	struct nl_dump_params params = {
 		.dp_fd = stdout,
-		.dp_type = NL_DUMP_FULL,
+		.dp_type = NL_DUMP_DETAILS,
 	};
 	int table = RT_TABLE_UNSPEC, scope = RT_SCOPE_UNIVERSE;
 	int tos = 0, err = 1;
diff --git a/src/nl-link-list.c b/src/nl-link-list.c
index 3afa5ed..99b1ad8 100644
--- a/src/nl-link-list.c
+++ b/src/nl-link-list.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 	struct nl_cache *link_cache;
 	struct rtnl_link *link;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 
diff --git a/src/nl-link-set.c b/src/nl-link-set.c
index 02c35d6..6dbf99e 100644
--- a/src/nl-link-set.c
+++ b/src/nl-link-set.c
@@ -49,7 +49,7 @@ static void set_cb(struct nl_object *obj, void *arg)
 	struct rtnl_link *link = nl_object_priv(obj);
 	struct rtnl_link *change = arg;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 	int err;
diff --git a/src/nl-neigh-add.c b/src/nl-neigh-add.c
index b222c7a..1c73e24 100644
--- a/src/nl-neigh-add.c
+++ b/src/nl-neigh-add.c
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 	struct rtnl_neigh *neigh;
 	struct nl_cache *link_cache;
 	struct nl_dump_params dp = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 	int err, ok = 0, nlflags = NLM_F_REPLACE | NLM_F_CREATE;
diff --git a/src/nl-neigh-delete.c b/src/nl-neigh-delete.c
index c9facb9..474d5f0 100644
--- a/src/nl-neigh-delete.c
+++ b/src/nl-neigh-delete.c
@@ -41,7 +41,7 @@ static void delete_cb(struct nl_object *obj, void *arg)
 {
 	struct rtnl_neigh *neigh = nl_object_priv(obj);
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 	int err;
diff --git a/src/nl-neigh-list.c b/src/nl-neigh-list.c
index aa766d5..4a74e27 100644
--- a/src/nl-neigh-list.c
+++ b/src/nl-neigh-list.c
@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
 	struct rtnl_neigh *neigh;
 	struct nl_cache *link_cache, *neigh_cache;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
  
diff --git a/src/nl-neightbl-list.c b/src/nl-neightbl-list.c
index 4e5acc6..8a7a83f 100644
--- a/src/nl-neightbl-list.c
+++ b/src/nl-neightbl-list.c
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
 	struct nl_sock *sock;
 	struct nl_cache *link_cache, *neightbl_cache;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
  
diff --git a/src/nl-qdisc-delete.c b/src/nl-qdisc-delete.c
index 32523b7..e0c82a2 100644
--- a/src/nl-qdisc-delete.c
+++ b/src/nl-qdisc-delete.c
@@ -40,7 +40,7 @@ static void delete_cb(struct nl_object *obj, void *arg)
 {
 	struct rtnl_qdisc *qdisc = nl_object_priv(obj);
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 	int err;
diff --git a/src/nl-qdisc-list.c b/src/nl-qdisc-list.c
index bad3817..b4e7116 100644
--- a/src/nl-qdisc-list.c
+++ b/src/nl-qdisc-list.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
 	struct rtnl_qdisc *qdisc;
 	struct nl_cache *link_cache, *qdisc_cache;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
  
diff --git a/src/nl-route-add.c b/src/nl-route-add.c
index 9c3c36a..47475a1 100644
--- a/src/nl-route-add.c
+++ b/src/nl-route-add.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 	struct nl_handle *sock;
 	struct rtnl_route *route;
 	struct nl_dump_params dp = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 	int err = 1;
diff --git a/src/nl-route-delete.c b/src/nl-route-delete.c
index 5a442b5..81cec58 100644
--- a/src/nl-route-delete.c
+++ b/src/nl-route-delete.c
@@ -60,7 +60,7 @@ static void delete_cb(struct nl_object *obj, void *arg)
 {
 	struct rtnl_route *route = (struct rtnl_route *) obj;
 	struct nl_dump_params params = {
-		.dp_type = NL_DUMP_ONELINE,
+		.dp_type = NL_DUMP_LINE,
 		.dp_fd = stdout,
 	};
 	int err;
diff --git a/src/nl-route-list.c b/src/nl-route-list.c
index 02b4851..f9f8813 100644
--- a/src/nl-route-list.c
+++ b/src/nl-route-list.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 	struct rtnl_route *route;
 	struct nl_dump_params params = {
 		.dp_fd = stdout,
-		.dp_type = NL_DUMP_BRIEF
+		.dp_type = NL_DUMP_LINE,
 	};
 	int print_cache = 0;
 
diff --git a/src/nl-rule-list.c b/src/nl-rule-list.c
index 7541d0a..12fc84b 100644
--- a/src/nl-rule-list.c
+++ b/src/nl-rule-list.c
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 	struct nl_cache *link_cache, *rule_cache;
 	struct nl_dump_params params = {
 		.dp_fd = stdout,
-		.dp_type = NL_DUMP_BRIEF
+		.dp_type = NL_DUMP_LINE,
 	};
 
 	sock = nlt_alloc_socket();
diff --git a/src/utils.c b/src/utils.c
index 95c9329..e00275f 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -90,9 +90,9 @@ struct nl_addr *nlt_addr_parse(const char *str, int family)
 int nlt_parse_dumptype(const char *str)
 {
 	if (!strcasecmp(str, "brief"))
-		return NL_DUMP_BRIEF;
+		return NL_DUMP_LINE;
 	else if (!strcasecmp(str, "details") || !strcasecmp(str, "detailed"))
-		return NL_DUMP_FULL;
+		return NL_DUMP_DETAILS;
 	else if (!strcasecmp(str, "stats"))
 		return NL_DUMP_STATS;
 	else if (!strcasecmp(str, "xml"))