diff options
author | H. Peter Anvin <hpa@zytor.com> | 2012-02-08 09:59:50 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2012-02-08 09:59:50 -0800 |
commit | f49425356d7a6a9885eda269ee6261a425328ade (patch) | |
tree | 7e2f9777d8b884672ecb9e9b05703421204ba9b6 | |
parent | a046c1f97242ff75dc8109a880403ec9318d948c (diff) | |
download | syslinux-f49425356d7a6a9885eda269ee6261a425328ade.tar.gz syslinux-f49425356d7a6a9885eda269ee6261a425328ade.tar.xz syslinux-f49425356d7a6a9885eda269ee6261a425328ade.zip |
extlinux: clean up main.c formatting
Clean up some ugly formatting in main.c.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r-- | extlinux/main.c | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/extlinux/main.c b/extlinux/main.c index d85d03c8..af87da2f 100644 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * * * Copyright 1998-2008 H. Peter Anvin - All Rights Reserved - * Copyright 2009-2010 Intel Corporation; author: H. Peter Anvin + * Copyright 2009-2012 Intel Corporation; author: H. Peter Anvin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -825,47 +825,46 @@ static const char *find_device(const char *mtab_file, dev_t dev) /* btrfs st_dev is not matched with mnt st_rdev, it is a known issue */ switch (fs_type) { case BTRFS: - if (!strcmp(mnt->mnt_type, "btrfs") && - !stat(mnt->mnt_dir, &dst) && - dst.st_dev == dev) { - if (!subvol[0]) { - get_default_subvol(mnt->mnt_dir, subvol); - } - done = true; - } - break; + if (!strcmp(mnt->mnt_type, "btrfs") && + !stat(mnt->mnt_dir, &dst) && + dst.st_dev == dev) { + if (!subvol[0]) + get_default_subvol(mnt->mnt_dir, subvol); + done = true; + } + break; case EXT2: - if ((!strcmp(mnt->mnt_type, "ext2") || - !strcmp(mnt->mnt_type, "ext3") || - !strcmp(mnt->mnt_type, "ext4")) && - !stat(mnt->mnt_fsname, &dst) && - dst.st_rdev == dev) { - done = true; - break; - } + if ((!strcmp(mnt->mnt_type, "ext2") || + !strcmp(mnt->mnt_type, "ext3") || + !strcmp(mnt->mnt_type, "ext4")) && + !stat(mnt->mnt_fsname, &dst) && + dst.st_rdev == dev) { + done = true; + break; + } case VFAT: - if ((!strcmp(mnt->mnt_type, "vfat")) && - !stat(mnt->mnt_fsname, &dst) && - dst.st_rdev == dev) { - done = true; - break; - } - case NTFS: - if ((!strcmp(mnt->mnt_type, "fuseblk") /* ntfs-3g */ || - !strcmp(mnt->mnt_type, "ntfs")) && - !stat(mnt->mnt_fsname, &dst) && - dst.st_rdev == dev) { - done = true; - break; - } + if ((!strcmp(mnt->mnt_type, "vfat")) && + !stat(mnt->mnt_fsname, &dst) && + dst.st_rdev == dev) { + done = true; + break; + } + case NTFS: + if ((!strcmp(mnt->mnt_type, "fuseblk") /* ntfs-3g */ || + !strcmp(mnt->mnt_type, "ntfs")) && + !stat(mnt->mnt_fsname, &dst) && + dst.st_rdev == dev) { + done = true; + break; + } - break; + break; case NONE: break; } if (done) { - devname = strdup(mnt->mnt_fsname); - break; + devname = strdup(mnt->mnt_fsname); + break; } } endmntent(mtab); @@ -994,7 +993,7 @@ static int ext_read_adv(const char *path, int devfd, const char **namep) if (err == 2) /* ldlinux.sys does not exist */ err = read_adv(path, name = "extlinux.sys"); if (namep) - *namep = name; + *namep = name; return err; } } |