[syslinux:master] extlinux: remove dead code in installer

syslinux-bot for H. Peter Anvin hpa at linux.intel.com
Thu Jul 28 14:15:07 PDT 2011


Commit-ID:  c210e571f61eeb898fadbb6f47d4a2c82e5bfbfd
Gitweb:     http://syslinux.zytor.com/commit/c210e571f61eeb898fadbb6f47d4a2c82e5bfbfd
Author:     H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Thu, 28 Jul 2011 14:13:31 -0700
Committer:  H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Thu, 28 Jul 2011 14:13:31 -0700

extlinux: remove dead code in installer

Remove some dead code in the installer, which caused build error with
gcc 4.6 and -Werror.

Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>


---
 extlinux/main.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/extlinux/main.c b/extlinux/main.c
index eca8732..e574051 100755
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -558,7 +558,6 @@ static char * get_default_subvol(char * rootdir, char * subvol)
     unsigned long off = 0;
     int name_len;
     char *name;
-    u64 dir_id;
     char dirname[4096];
     u64 defaultsubvolid = 0;
 
@@ -716,14 +715,12 @@ static char * get_default_subvol(char * rootdir, char * subvol)
                ref = (struct btrfs_root_ref *)(args.buf + off);
                name_len = ref->name_len;
                name = (char *)(ref + 1);
-               dir_id = ref->dirid;
 
-               /*add_root(&root_lookup, sh->objectid, sh->offset,
-                        dir_id, name, name_len);*/
                if (sh->objectid == defaultsubvolid) {
                    strncpy(subvol, name, name_len);
                    subvol[name_len] = '\0';
-                   dprintf("The default subvolume: %s, ID: %llu\n", subvol, sh->objectid);
+                   dprintf("The default subvolume: %s, ID: %llu\n",
+			   subvol, sh->objectid);
                    break;
                }
 



More information about the Syslinux-commits mailing list