]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
genl: remove unused code
authorDan McGee <dan@archlinux.org>
Wed, 31 Aug 2011 19:15:22 +0000 (12:15 -0700)
committerStephen Hemminger <shemminger@vyatta.com>
Wed, 31 Aug 2011 19:15:22 +0000 (12:15 -0700)
remove unused basename logic, avoid dereference of possibly NULL variable

genl/genl.c

index 7ec24eb11482153721aee772903764aa7576fa0a..49b65960d9377b4ba875a452e609ea1a2c3ef567 100644 (file)
@@ -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);