Get rid of all visible signs of port number and ifindex

from API, and display output.

Fix foreach_port for case when /sys is missing (but compiled for sysfs).

2 files changed, 12 insertions, 18 deletions

diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c
index f9da974..9ab7166 100644
--- a/brctl/brctl_cmd.c
+++ b/brctl/brctl_cmd.c
@@ -82,16 +82,13 @@ static int br_cmd_delbr(char** argv)
 static int br_cmd_addif(char** argv)
 {
 	int err;
-	int ifindex = if_nametoindex(argv[2]);
 
-	if (!ifindex) {
-		fprintf(stderr, "interface %s does not exist!\n", argv[2]);
-		return 1;
-	}
-
-	switch (err = br_add_interface(argv[1], ifindex)) {
+	switch (err = br_add_interface(argv[1], argv[2])) {
 	case 0:
 		return 0;
+	case ENODEV:
+		fprintf(stderr, "interface %s does not exist!\n", argv[2]);
+		return 1;
 
 	case EBUSY:
 		fprintf(stderr,	"device %s is already a member of a bridge; "
@@ -115,16 +112,13 @@ static int br_cmd_addif(char** argv)
 static int br_cmd_delif(char** argv)
 {
 	int err;
-	int ifindex = if_nametoindex(argv[2]);
 
-	if (!ifindex) {
-		fprintf(stderr, "interface %s does not exist!\n", argv[2]);
-		return 1;
-	}
-
-	switch (err = br_del_interface(argv[1], ifindex)) {
+	switch (err = br_del_interface(argv[1], argv[2])) {
 	case 0:
 		return 0;
+	case ENODEV:
+		fprintf(stderr, "interface %s does not exist!\n", argv[2]);
+		return 1;
 
 	case EINVAL:
 		fprintf(stderr, "device %s is not a slave of %s\n",
diff --git a/brctl/brctl_disp.c b/brctl/brctl_disp.c
index a1f4aa3..acdc687 100644
--- a/brctl/brctl_disp.c
+++ b/brctl/brctl_disp.c
@@ -37,7 +37,7 @@ void br_show_timer(const struct timeval *tv)
 
 static int first;
 
-static int dump_interface(const char *b, const char *p, int ind, void *arg)
+static int dump_interface(const char *b, const char *p, void *arg)
 {
 
 	if (first) 
@@ -62,12 +62,12 @@ void br_dump_interface_list(const char *br)
 		printf("\n");
 }
 
-static int dump_port_info(const char *br, const char *p,  int count, void *arg)
+static int dump_port_info(const char *br, const char *p,  void *arg)
 {
 	struct port_info pinfo;
 
-	printf("%s (%i)", p, count);
-	if (br_get_port_info(br, p, count, &pinfo)) {
+	printf("%s", p);
+	if (br_get_port_info(br, p, &pinfo)) {
 		printf("\tcan't get port info\n");
 		return 1;
 	}