From: Dan McGee <dan@archlinux.org>
Date: Wed, 31 Aug 2011 19:15:22 +0000 (-0700)
Subject: genl: remove unused code
X-Git-Tag: v3.0.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b129bf2fe280f9aa7a22cbcd00dd3114dd5d65c;p=thirdparty%2Fiproute2.git

genl: remove unused code

remove unused basename logic, avoid dereference of possibly NULL variable
---

diff --git a/genl/genl.c b/genl/genl.c
index 7ec24eb11..49b65960d 100644
--- a/genl/genl.c
+++ b/genl/genl.c
@@ -109,14 +109,6 @@ static void usage(void)
 
 int main(int argc, char **argv)
 {
-	char *basename;
-
-	basename = strrchr(argv[0], '/');
-	if (basename == NULL)
-		basename = argv[0];
-	else
-		basename++;
-
 	while (argc > 1) {
 		if (argv[1][0] != '-')
 			break;
@@ -144,8 +136,9 @@ int main(int argc, char **argv)
 		int ret;
 		struct genl_util *a = NULL;
 		a = get_genl_kind(argv[1]);
-		if (NULL == a) {
-			fprintf(stderr,"bad genl %s\n",argv[1]);
+		if (!a) {
+			fprintf(stderr,"bad genl %s\n", argv[1]);
+			exit(-1);
 		}
 
 		ret = a->parse_genlopt(a, argc-1, argv+1);