ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
maximilian attems 2011-08-29 18:59:35 +02:00 committed by Karel Zak
parent 4ff826f68a
commit 89c5005380
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
disk-utils/raw.c
View File

@ -40,8 +40,8 @@ int master_fd;
int raw_minor; int raw_minor;
void open_raw_ctl(void); 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);
int bind (int minor, int block_major, int block_minor); static int bind(int minor_raw, int block_major, int block_minor);
static void usage(int err) 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; struct raw_config_request rq;
static int has_worked = 0; static int has_worked = 0;
@ -216,10 +216,10 @@ int query(int minor, const char *raw_name, int quiet)
raw_name); raw_name);
exit(2); 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); err = ioctl(master_fd, RAW_GETBIND, &rq);
if (err < 0) { if (err < 0) {
if (quiet && errno == ENODEV) 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) if (quiet && !rq.block_major && !rq.block_minor)
return 0; return 0;
printf (_("%sraw%d: bound to major %d, minor %d\n"), 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; 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; struct raw_config_request rq;
int err; int err;
rq.raw_minor = minor; rq.raw_minor = minor_raw;
rq.block_major = block_major; rq.block_major = block_major;
rq.block_minor = block_minor; rq.block_minor = block_minor;
err = ioctl(master_fd, RAW_SETBIND, &rq); err = ioctl(master_fd, RAW_SETBIND, &rq);