summaryrefslogtreecommitdiff
path: root/lib/fsusage.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-06-02 05:05:29 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-06-02 05:05:29 +0000
commitab2edb9e3307a172487bb16edcaf79600bf9ebea (patch)
tree891357990f461f806713fa4cb52c1b9bb91d1ba3 /lib/fsusage.c
parent1e6b9bd047bdaf17291f87e44a218814dd6560f5 (diff)
downloadcoreutils-ab2edb9e3307a172487bb16edcaf79600bf9ebea.tar.xz
Don't use "path" or "filename" to mean "file name"
in comments or local variable names.
Diffstat (limited to 'lib/fsusage.c')
-rw-r--r--lib/fsusage.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/fsusage.c b/lib/fsusage.c
index d2a6cc21f..972d88f12 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -1,7 +1,7 @@
/* fsusage.c -- return space usage of mounted file systems
- Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002, 2003, 2004 Free
- Software Foundation, Inc.
+ Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
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
@@ -103,20 +103,20 @@
#define PROPAGATE_TOP_BIT(x) ((x) | ~ (EXTRACT_TOP_BIT (x) - 1))
/* Fill in the fields of FSP with information about space usage for
- the file system on which PATH resides.
- DISK is the device on which PATH is mounted, for space-getting
+ the file system on which FILE resides.
+ DISK is the device on which FILE is mounted, for space-getting
methods that need to know it.
Return 0 if successful, -1 if not. When returning -1, ensure that
ERRNO is either a system error value, or zero if DISK is NULL
on a system that requires a non-NULL value. */
int
-get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
+get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
{
#ifdef STAT_STATFS3_OSF1
struct statfs fsd;
- if (statfs (path, &fsd, sizeof (struct statfs)) != 0)
+ if (statfs (file, &fsd, sizeof (struct statfs)) != 0)
return -1;
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
@@ -127,7 +127,7 @@ get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
struct fs_data fsd;
- if (statfs (path, &fsd) != 1)
+ if (statfs (file, &fsd) != 1)
return -1;
fsp->fsu_blocksize = 1024;
@@ -181,7 +181,7 @@ get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
struct statfs fsd;
- if (statfs (path, &fsd) < 0)
+ if (statfs (file, &fsd) < 0)
return -1;
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
@@ -207,7 +207,7 @@ get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
struct statfs fsd;
- if (statfs (path, &fsd) < 0)
+ if (statfs (file, &fsd) < 0)
return -1;
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
@@ -222,7 +222,7 @@ get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
struct statfs fsd;
- if (statfs (path, &fsd, sizeof fsd, 0) < 0)
+ if (statfs (file, &fsd, sizeof fsd, 0) < 0)
return -1;
/* Empirically, the block counts on most SVR3 and SVR3-derived
@@ -240,7 +240,7 @@ get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
struct statvfs fsd;
- if (statvfs (path, &fsd) < 0)
+ if (statvfs (file, &fsd) < 0)
return -1;
/* f_frsize isn't guaranteed to be supported. */
@@ -269,12 +269,12 @@ get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
/* AIX PS/2 does not supply statfs. */
int
-statfs (char *path, struct statfs *fsb)
+statfs (char *file, struct statfs *fsb)
{
struct stat stats;
struct dustat fsd;
- if (stat (path, &stats))
+ if (stat (file, &stats) != 0)
return -1;
if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd)))
return -1;