]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
net: remove dead and redundant code
authorAndrei Borzenkov <arvidjaar@gmail.com>
Sun, 10 Jan 2016 08:33:13 +0000 (11:33 +0300)
committerAndrei Borzenkov <arvidjaar@gmail.com>
Sun, 10 Jan 2016 08:33:13 +0000 (11:33 +0300)
server cannot be NULL at this point (we return error earlier if it is).
Also structure is zalloc'ed, so no need to explicitly initialize
members to 0.

Found by: Coverity scan.
CID: 73837

grub-core/net/net.c

index a0472d5d464a1807093c9b95487a2e5ba5a8ad28..85b0cf7745bbb3aaffb39fbe31caff734c5f1fab 100644 (file)
@@ -1322,20 +1322,13 @@ grub_net_open_real (const char *name)
            if (!ret)
              return NULL;
            ret->protocol = proto;
-           if (server)
+           ret->server = grub_strdup (server);
+           if (!ret->server)
              {
-               ret->server = grub_strdup (server);
-               if (!ret->server)
-                 {
-                   grub_free (ret);
-                   return NULL;
-                 }
+               grub_free (ret);
+               return NULL;
              }
-           else
-             ret->server = NULL;
            ret->fs = &grub_net_fs;
-           ret->offset = 0;
-           ret->eof = 0;
            return ret;
          }
       }