aboutsummaryrefslogtreecommitdiffstats
path: root/extlinux
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-07-28 14:13:31 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-28 14:13:31 -0700
commitc210e571f61eeb898fadbb6f47d4a2c82e5bfbfd (patch)
treea3dd48eefb1e289a5a1ce3d5b79024f123d26314 /extlinux
parent9bba61ccd4b4515bcf4d2dc06ddc4f6329318547 (diff)
downloadsyslinux-c210e571f61eeb898fadbb6f47d4a2c82e5bfbfd.tar.gz
syslinux-c210e571f61eeb898fadbb6f47d4a2c82e5bfbfd.tar.xz
syslinux-c210e571f61eeb898fadbb6f47d4a2c82e5bfbfd.zip
extlinux: remove dead code in installersyslinux-4.05-pre5
Remove some dead code in the installer, which caused build error with gcc 4.6 and -Werror. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'extlinux')
-rwxr-xr-xextlinux/main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/extlinux/main.c b/extlinux/main.c
index eca87326..e574051b 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;
}