diff options
| author | maximilian attems | 2011-08-29 18:59:35 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-08-30 11:52:03 +0200 |
| commit | 89c5005380714d54aa0d5734221fad0aa7c67e0a (patch) | |
| tree | 994e3e5296f20fde9ca804ae25f5d36d49a0dacd | |
| parent | whereis: search in path for binaries only (diff) | |
| download | kernel-qcow2-util-linux-89c5005380714d54aa0d5734221fad0aa7c67e0a.tar.gz kernel-qcow2-util-linux-89c5005380714d54aa0d5734221fad0aa7c67e0a.tar.xz kernel-qcow2-util-linux-89c5005380714d54aa0d5734221fad0aa7c67e0a.zip | |
raw: fix shadowing of minor function
Noticed while compiling against klibc:
raw.c: In function ‘query’:
raw.c:219:16: error: called object ‘minor’ is not a function
Rename variable from minor to minor_raw.
While at it mark the functions as static and small whitespace fixes
as asked by checkpatch.
[kzak@redhat.com: - rename variable at line 241 too]
Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | disk-utils/raw.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/disk-utils/raw.c b/disk-utils/raw.c index c2c1a3e4f..4cb74ca6f 100644 --- a/disk-utils/raw.c +++ b/disk-utils/raw.c @@ -40,8 +40,8 @@ int master_fd; int raw_minor; void open_raw_ctl(void); -int query(int minor, const char *raw_name, int quiet); -int bind (int minor, int block_major, int block_minor); +static int query(int minor_raw, const char *raw_name, int quiet); +static int bind(int minor_raw, int block_major, int block_minor); static void usage(int err) @@ -190,7 +190,7 @@ void open_raw_ctl(void) } } -int query(int minor, const char *raw_name, int quiet) +static int query(int minor_raw, const char *raw_name, int quiet) { struct raw_config_request rq; static int has_worked = 0; @@ -216,10 +216,10 @@ int query(int minor, const char *raw_name, int quiet) raw_name); exit(2); } - minor = minor(statbuf.st_rdev); + minor_raw = minor(statbuf.st_rdev); } - rq.raw_minor = minor; + rq.raw_minor = minor_raw; err = ioctl(master_fd, RAW_GETBIND, &rq); if (err < 0) { if (quiet && errno == ENODEV) @@ -238,16 +238,16 @@ int query(int minor, const char *raw_name, int quiet) if (quiet && !rq.block_major && !rq.block_minor) return 0; printf (_("%sraw%d: bound to major %d, minor %d\n"), - RAWDEVDIR, minor, (int) rq.block_major, (int) rq.block_minor); + RAWDEVDIR, minor_raw, (int) rq.block_major, (int) rq.block_minor); return 0; } -int bind(int minor, int block_major, int block_minor) +static int bind(int minor_raw, int block_major, int block_minor) { struct raw_config_request rq; int err; - rq.raw_minor = minor; + rq.raw_minor = minor_raw; rq.block_major = block_major; rq.block_minor = block_minor; err = ioctl(master_fd, RAW_SETBIND, &rq); |