diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ext2fs/ChangeLog | 3 | ||||
| -rw-r--r-- | lib/ext2fs/ext2fs.h | 4 | ||||
| -rw-r--r-- | lib/ext2fs/read_bb_file.c | 10 |
3 files changed, 10 insertions, 7 deletions
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index e67e57dc..5d154d0b 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,5 +1,8 @@ 2002-07-14 Theodore Ts'o <tytso@mit.edu> + * ext2fs.h, read_bb_file.c: Change private to priv_data, to avoid + using a C++ reserved word. + * unix_io.c (unix_open): Only attempt the setrlimit workaround if the kernel version is 2.4.10 -- 2.4.17, since otherwise an old version of glibc (built against 2.2 headers) will diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index 2763e682..b7f5ff21 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -801,11 +801,11 @@ extern errcode_t ext2fs_read_bb_inode(ext2_filsys fs, /* read_bb_file.c */ extern errcode_t ext2fs_read_bb_FILE2(ext2_filsys fs, FILE *f, ext2_badblocks_list *bb_list, - void *private, + void *priv_data, void (*invalid)(ext2_filsys fs, blk_t blk, char *badstr, - void *private)); + void *priv_data)); extern errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f, ext2_badblocks_list *bb_list, void (*invalid)(ext2_filsys fs, diff --git a/lib/ext2fs/read_bb_file.c b/lib/ext2fs/read_bb_file.c index 7f54d6e6..f671b92b 100644 --- a/lib/ext2fs/read_bb_file.c +++ b/lib/ext2fs/read_bb_file.c @@ -31,11 +31,11 @@ */ errcode_t ext2fs_read_bb_FILE2(ext2_filsys fs, FILE *f, ext2_badblocks_list *bb_list, - void *private, + void *priv_data, void (*invalid)(ext2_filsys fs, blk_t blk, char *badstr, - void *private)) + void *priv_data)) { errcode_t retval; blk_t blockno; @@ -61,7 +61,7 @@ errcode_t ext2fs_read_bb_FILE2(ext2_filsys fs, FILE *f, ((blockno < fs->super->s_first_data_block) || (blockno >= fs->super->s_blocks_count))) { if (invalid) - (invalid)(fs, blockno, buf, private); + (invalid)(fs, blockno, buf, priv_data); continue; } retval = ext2fs_badblocks_list_add(*bb_list, blockno); @@ -72,11 +72,11 @@ errcode_t ext2fs_read_bb_FILE2(ext2_filsys fs, FILE *f, } static void call_compat_invalid(ext2_filsys fs, blk_t blk, - char *badstr, void *private) + char *badstr, void *priv_data) { void (*invalid)(ext2_filsys, blk_t); - invalid = (void (*)(ext2_filsys, blk_t)) private; + invalid = (void (*)(ext2_filsys, blk_t)) priv_data; if (invalid) invalid(fs, blk); } |