From 7298a32e0f1b8867a63a9d4b2973ad0644ac75c8 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Thu, 27 Sep 2012 10:52:04 +0400 Subject: [PATCH] (get_fs_usage): avoid compile warning about mixed declarations and code. Signed-off-by: Andrew Borodin --- src/filemanager/mountlist.c | 184 ++++++++++++++++++++++---------------------- 1 file changed, 93 insertions(+), 91 deletions(-) diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c index 44b4a24d7..74a6dc6a8 100644 --- a/src/filemanager/mountlist.c +++ b/src/filemanager/mountlist.c @@ -284,7 +284,7 @@ statvfs_works (void) return 1; } #else -#include /* for strverscmp */ +#include /* for strverscmp */ #include #include #define STAT_STATFS2_BSIZE 1 @@ -297,12 +297,12 @@ statvfs_works (void) if (statvfs_works_cache < 0) statvfs_works_cache = (uname (&name) == 0 && 0 <= strverscmp (name.release, "2.6.36")); - return statvfs_works_cache; + return statvfs_works_cache; } #endif #endif -#ifdef STAT_READ_FILSYS /* SVR2 */ +#ifdef STAT_READ_FILSYS /* SVR2 */ /* Set errno to zero upon EOF. */ #define ZERO_BYTE_TRANSFER_ERRNO 0 @@ -1352,126 +1352,126 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (vfsd.f_bavail) != 0; fsp->fsu_files = PROPAGATE_ALL_ONES (vfsd.f_files); fsp->fsu_ffree = PROPAGATE_ALL_ONES (vfsd.f_ffree); - return 0; } - + else #endif -#if defined STAT_STATVFS64 /* AIX */ + { +#if defined STAT_STATVFS64 /* AIX */ - struct statvfs64 fsd; + struct statvfs64 fsd; - if (statvfs64 (file, &fsd) < 0) - return -1; + if (statvfs64 (file, &fsd) < 0) + return -1; - /* f_frsize isn't guaranteed to be supported. */ - /* *INDENT-OFF* */ - fsp->fsu_blocksize = fsd.f_frsize - ? PROPAGATE_ALL_ONES (fsd.f_frsize) - : PROPAGATE_ALL_ONES (fsd.f_bsize); - /* *INDENT-ON* */ + /* f_frsize isn't guaranteed to be supported. */ + /* *INDENT-OFF* */ + fsp->fsu_blocksize = fsd.f_frsize + ? PROPAGATE_ALL_ONES (fsd.f_frsize) + : PROPAGATE_ALL_ONES (fsd.f_bsize); + /* *INDENT-ON* */ #elif defined STAT_STATFS2_FS_DATA /* Ultrix */ - struct fs_data fsd; + struct fs_data fsd; - if (statfs (file, &fsd) != 1) - return -1; + if (statfs (file, &fsd) != 1) + return -1; - fsp->fsu_blocksize = 1024; - fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.fd_req.btot); - fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.fd_req.bfree); - fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.fd_req.bfreen); - fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.fd_req.bfreen) != 0; - fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.fd_req.gtot); - fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.fd_req.gfree); + fsp->fsu_blocksize = 1024; + fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.fd_req.btot); + fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.fd_req.bfree); + fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.fd_req.bfreen); + fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.fd_req.bfreen) != 0; + fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.fd_req.gtot); + fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.fd_req.gfree); #elif defined STAT_READ_FILSYS /* SVR2 */ #ifndef SUPERBOFF #define SUPERBOFF (SUPERB * 512) #endif - struct filsys fsd; - int fd; + struct filsys fsd; + int fd; - if (!disk) - { - errno = 0; - return -1; - } + if (!disk) + { + errno = 0; + return -1; + } - fd = open (disk, O_RDONLY); - if (fd < 0) - return -1; - lseek (fd, (off_t) SUPERBOFF, 0); - if (full_read (fd, (char *) &fsd, sizeof (fsd)) != sizeof (fsd)) - { + fd = open (disk, O_RDONLY); + if (fd < 0) + return -1; + lseek (fd, (off_t) SUPERBOFF, 0); + if (full_read (fd, (char *) &fsd, sizeof (fsd)) != sizeof (fsd)) + { + close (fd); + return -1; + } close (fd); - return -1; - } - close (fd); - fsp->fsu_blocksize = (fsd.s_type == Fs2b ? 1024 : 512); - fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.s_fsize); - fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.s_tfree); - fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.s_tfree); - fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.s_tfree) != 0; - fsp->fsu_files = (fsd.s_isize == -1 - ? UINTMAX_MAX : (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1)); - fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.s_tinode); + fsp->fsu_blocksize = (fsd.s_type == Fs2b ? 1024 : 512); + fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.s_fsize); + fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.s_tfree); + fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.s_tfree); + fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.s_tfree) != 0; + fsp->fsu_files = (fsd.s_isize == -1 + ? UINTMAX_MAX : (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1)); + fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.s_tinode); #elif defined STAT_STATFS3_OSF1 /* OSF/1 */ - struct statfs fsd; + struct statfs fsd; - if (statfs (file, &fsd, sizeof (struct statfs)) != 0) - return -1; + if (statfs (file, &fsd, sizeof (struct statfs)) != 0) + return -1; - fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize); + fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize); -#elif defined STAT_STATFS2_FRSIZE /* 2.6 < glibc/Linux < 2.6.36 */ +#elif defined STAT_STATFS2_FRSIZE /* 2.6 < glibc/Linux < 2.6.36 */ - struct statfs fsd; + struct statfs fsd; - if (statfs (file, &fsd) < 0) - return -1; + if (statfs (file, &fsd) < 0) + return -1; - fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_frsize); + fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_frsize); #elif defined STAT_STATFS2_BSIZE /* glibc/Linux < 2.6, 4.3BSD, SunOS 4, \ Mac OS X < 10.4, FreeBSD < 5.0, \ NetBSD < 3.0, OpenBSD < 4.4 */ - struct statfs fsd; + struct statfs fsd; - if (statfs (file, &fsd) < 0) - return -1; + if (statfs (file, &fsd) < 0) + return -1; - fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize); + fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize); #ifdef STATFS_TRUNCATES_BLOCK_COUNTS - /* In SunOS 4.1.2, 4.1.3, and 4.1.3_U1, the block counts in the - struct statfs are truncated to 2GB. These conditions detect that - truncation, presumably without botching the 4.1.1 case, in which - the values are not truncated. The correct counts are stored in - undocumented spare fields. */ - if (fsd.f_blocks == 0x7fffffff / fsd.f_bsize && fsd.f_spare[0] > 0) - { - fsd.f_blocks = fsd.f_spare[0]; - fsd.f_bfree = fsd.f_spare[1]; - fsd.f_bavail = fsd.f_spare[2]; - } + /* In SunOS 4.1.2, 4.1.3, and 4.1.3_U1, the block counts in the + struct statfs are truncated to 2GB. These conditions detect that + truncation, presumably without botching the 4.1.1 case, in which + the values are not truncated. The correct counts are stored in + undocumented spare fields. */ + if (fsd.f_blocks == 0x7fffffff / fsd.f_bsize && fsd.f_spare[0] > 0) + { + fsd.f_blocks = fsd.f_spare[0]; + fsd.f_bfree = fsd.f_spare[1]; + fsd.f_bavail = fsd.f_spare[2]; + } #endif /* STATFS_TRUNCATES_BLOCK_COUNTS */ #elif defined STAT_STATFS2_FSIZE /* 4.4BSD and older NetBSD */ - struct statfs fsd; + struct statfs fsd; - if (statfs (file, &fsd) < 0) - return -1; + if (statfs (file, &fsd) < 0) + return -1; - fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize); + fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize); #elif defined STAT_STATFS4 /* SVR3, Dynix, old Irix, old AIX, \ Dolphin */ @@ -1480,18 +1480,18 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) #define f_bavail f_bfree #endif - struct statfs fsd; + struct statfs fsd; - if (statfs (file, &fsd, sizeof (fsd), 0) < 0) - return -1; + if (statfs (file, &fsd, sizeof (fsd), 0) < 0) + return -1; - /* Empirically, the block counts on most SVR3 and SVR3-derived - systems seem to always be in terms of 512-byte blocks, - no matter what value f_bsize has. */ + /* Empirically, the block counts on most SVR3 and SVR3-derived + systems seem to always be in terms of 512-byte blocks, + no matter what value f_bsize has. */ #if defined _AIX || defined _CRAY - fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize); + fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize); #else - fsp->fsu_blocksize = 512; + fsp->fsu_blocksize = 512; #endif #endif @@ -1500,14 +1500,16 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) || defined STAT_STATFS2_FRSIZE || defined STAT_STATFS2_BSIZE \ || defined STAT_STATFS2_FSIZE || defined STAT_STATFS4) - fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.f_blocks); - fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.f_bfree); - fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.f_bavail); - fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.f_bavail) != 0; - fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.f_files); - fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.f_ffree); + fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.f_blocks); + fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.f_bfree); + fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.f_bavail); + fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.f_bavail) != 0; + fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.f_files); + fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.f_ffree); #endif + } + (void) disk; /* avoid argument-unused warning */ return 0; -- 2.11.4.GIT