ext2fs, blkid: localize environment-specific variables

Restructure the ext2fs_get_device_size() and blkid_get_dev_size()
code to localize the variables used for different device probing
methods.  This at least reduces the #ifdef mess to only one part
of the code for each method, and avoids "unused variable" compiler
warnings added when variables are declared without being #ifdef'd.

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

1 files changed, 56 insertions, 49 deletions

diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c
index f670e1b1..f9be9622 100644
--- a/lib/blkid/getsize.c
+++ b/lib/blkid/getsize.c
@@ -75,52 +75,46 @@ static int valid_offset(int fd, blkid_loff_t offset)
  */
 blkid_loff_t blkid_get_dev_size(int fd)
 {
-	int valid_blkgetsize64 = 1;
-#ifdef __linux__
-	struct		utsname ut;
-#endif
 	unsigned long long size64;
-	unsigned long size;
 	blkid_loff_t high, low;
-#ifdef FDGETPRM
-	struct floppy_struct this_floppy;
-#endif
-#ifdef HAVE_SYS_DISKLABEL_H
-	int part = -1;
-	struct disklabel lab;
-	struct partition *pp;
-	char ch;
-	struct stat st;
-#endif /* HAVE_SYS_DISKLABEL_H */
 
 #ifdef DKIOCGETBLOCKCOUNT	/* For Apple Darwin */
 	if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) {
-		if ((sizeof(blkid_loff_t) < sizeof(unsigned long long))
-		    && (size64 << 9 > 0xFFFFFFFF))
+		if (sizeof(blkid_loff_t) < sizeof(unsigned long long) &&
+		    (size64 << 9) > 0xFFFFFFFF)
 			return 0; /* EFBIG */
-		return (blkid_loff_t) size64 << 9;
+		return (blkid_loff_t)size64 << 9;
 	}
 #endif
 
 #ifdef BLKGETSIZE64
+	{
+		int valid_blkgetsize64 = 1;
 #ifdef __linux__
-	if ((uname(&ut) == 0) &&
-	    ((ut.release[0] == '2') && (ut.release[1] == '.') &&
-	     (ut.release[2] < '6') && (ut.release[3] == '.')))
-		valid_blkgetsize64 = 0;
-#endif
-	if (valid_blkgetsize64 &&
-	    ioctl(fd, BLKGETSIZE64, &size64) >= 0) {
-		if ((sizeof(blkid_loff_t) < sizeof(unsigned long long))
-		    && ((size64) > 0xFFFFFFFF))
-			return 0; /* EFBIG */
-		return size64;
+		struct		utsname ut;
+
+		if ((uname(&ut) == 0) &&
+		    ((ut.release[0] == '2') && (ut.release[1] == '.') &&
+		     (ut.release[2] < '6') && (ut.release[3] == '.')))
+			valid_blkgetsize64 = 0;
+#endif
+		if (valid_blkgetsize64 &&
+		    ioctl(fd, BLKGETSIZE64, &size64) >= 0) {
+			if (sizeof(blkid_loff_t) < sizeof(unsigned long long) &&
+			    (size64 > 0xFFFFFFFF))
+				return 0; /* EFBIG */
+			return size64;
+		}
 	}
 #endif /* BLKGETSIZE64 */
 
 #ifdef BLKGETSIZE
-	if (ioctl(fd, BLKGETSIZE, &size) >= 0)
-		return (blkid_loff_t)size << 9;
+	{
+		unsigned long size;
+
+		if (ioctl(fd, BLKGETSIZE, &size) >= 0)
+			return (blkid_loff_t)size << 9;
+	}
 #endif
 
 /* tested on FreeBSD 6.1-RELEASE i386 */
@@ -130,26 +124,39 @@ blkid_loff_t blkid_get_dev_size(int fd)
 #endif /* DIOCGMEDIASIZE */
 
 #ifdef FDGETPRM
-	if (ioctl(fd, FDGETPRM, &this_floppy) >= 0)
-		return (blkid_loff_t)this_floppy.size << 9;
+	{
+		struct floppy_struct this_floppy;
+
+		if (ioctl(fd, FDGETPRM, &this_floppy) >= 0)
+			return (blkid_loff_t)this_floppy.size << 9;
+	}
 #endif
 #ifdef HAVE_SYS_DISKLABEL_H
-	/*
-	 * This code works for FreeBSD 4.11 i386, except for the full device
-	 * (such as /dev/ad0). It doesn't work properly for newer FreeBSD
-	 * though. FreeBSD >= 5.0 should be covered by the DIOCGMEDIASIZE
-	 * above however.
-	 *
-	 * Note that FreeBSD >= 4.0 has disk devices as unbuffered (raw,
-	 * character) devices, so we need to check for S_ISCHR, too.
-	 */
-	if (fstat(fd, &st) >= 0 && (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
-		part = st.st_rdev & 7;
-
-	if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
-		pp = &lab.d_partitions[part];
-		if (pp->p_size)
-			return pp->p_size << 9;
+	{
+		int part = -1;
+		struct disklabel lab;
+		struct partition *pp;
+		char ch;
+		struct stat st;
+
+		/*
+		 * This code works for FreeBSD 4.11 i386, except for the full
+		 * device (such as /dev/ad0). It doesn't work properly for
+		 * newer FreeBSD though. FreeBSD >= 5.0 should be covered by
+		 * the DIOCGMEDIASIZE above however.
+		 *
+		 * Note that FreeBSD >= 4.0 has disk devices as unbuffered (raw,
+		 * character) devices, so we need to check for S_ISCHR, too.
+		 */
+		if (fstat(fd, &st) >= 0 &&
+		    (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
+			part = st.st_rdev & 7;
+
+		if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
+			pp = &lab.d_partitions[part];
+			if (pp->p_size)
+				return pp->p_size << 9;
+		}
 	}
 #endif /* HAVE_SYS_DISKLABEL_H */
 	{