vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

ext2fs.h, read_bb_file.c: Change private to priv_data, to avoid 

using a C++ reserved word.
bitmap-optimize
Theodore Ts'o 2002-07-14 16:00:50 -04:00
parent 593c6ead7e
commit 50cd7e06e2
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ext2fs/ChangeLog
View File

@ -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

4
lib/ext2fs/ext2fs.h
View File

@ -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,

10
lib/ext2fs/read_bb_file.c
View File

@ -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);
}