xfsprogs: remove xfs_caddr_t
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index f76a0e9..44a32e8 100644
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -1142,8 +1142,8 @@
return 0;
}
-xfs_caddr_t
-next_log_chunk(xfs_caddr_t p, int offset, void *private)
+char *
+next_log_chunk(char *p, int offset, void *private)
{
wbuf *buf = (wbuf *)private;
@@ -1166,7 +1166,7 @@
xfs_off_t
write_log_header(int fd, wbuf *buf, xfs_mount_t *mp)
{
- xfs_caddr_t p = buf->data;
+ char *p = buf->data;
xfs_off_t logstart;
int offset;
diff --git a/include/darwin.h b/include/darwin.h
index ec8cb4f..30f0052 100644
--- a/include/darwin.h
+++ b/include/darwin.h
@@ -124,7 +124,6 @@
typedef u_int64_t xfs_ino_t;
typedef u_int32_t xfs_dev_t;
typedef int64_t xfs_daddr_t;
-typedef char* xfs_caddr_t;
#define stat64 stat
#define fstat64 fstat
diff --git a/include/freebsd.h b/include/freebsd.h
index 0ae1262..e59b1e8 100644
--- a/include/freebsd.h
+++ b/include/freebsd.h
@@ -52,7 +52,6 @@
typedef __uint64_t xfs_ino_t;
typedef __uint32_t xfs_dev_t;
typedef __int64_t xfs_daddr_t;
-typedef char* xfs_caddr_t;
#define O_LARGEFILE 0
diff --git a/include/gnukfreebsd.h b/include/gnukfreebsd.h
index 605da66..f2e1bf5 100644
--- a/include/gnukfreebsd.h
+++ b/include/gnukfreebsd.h
@@ -42,7 +42,6 @@
typedef __uint64_t xfs_ino_t;
typedef __uint32_t xfs_dev_t;
typedef __int64_t xfs_daddr_t;
-typedef char* xfs_caddr_t;
#define HAVE_FID 1
diff --git a/include/irix.h b/include/irix.h
index ea1f219..31050c4 100644
--- a/include/irix.h
+++ b/include/irix.h
@@ -46,7 +46,6 @@
typedef __int64_t xfs_ino_t;
typedef __int32_t xfs_dev_t;
typedef __int64_t xfs_daddr_t;
-typedef char* xfs_caddr_t;
#define xfs_flock64 flock64
#define xfs_flock64_t struct flock64
diff --git a/include/libxfs.h b/include/libxfs.h
index 1fd8bda..0085a69 100644
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -146,11 +146,11 @@
extern int platform_nproc(void);
/* check or write log footer: specify device, log size in blocks & uuid */
-typedef xfs_caddr_t (libxfs_get_block_t)(xfs_caddr_t, int, void *);
+typedef char *(libxfs_get_block_t)(char *, int, void *);
extern int libxfs_log_clear (struct xfs_buftarg *, xfs_daddr_t, uint,
uuid_t *, int, int, int);
-extern int libxfs_log_header (xfs_caddr_t, uuid_t *, int, int, int,
+extern int libxfs_log_header (char *, uuid_t *, int, int, int,
libxfs_get_block_t *, void *);
diff --git a/include/libxlog.h b/include/libxlog.h
index e2ab5ad..0c55a86 100644
--- a/include/libxlog.h
+++ b/include/libxlog.h
@@ -88,7 +88,7 @@
extern struct xfs_buf *xlog_get_bp(struct xlog *, int);
extern void xlog_put_bp(struct xfs_buf *);
extern int xlog_bread(struct xlog *log, xfs_daddr_t blk_no, int nbblks,
- xfs_buf_t *bp, xfs_caddr_t *offset);
+ xfs_buf_t *bp, char **offset);
extern int xlog_bread_noalign(struct xlog *log, xfs_daddr_t blk_no,
int nbblks, xfs_buf_t *bp);
@@ -101,7 +101,7 @@
extern int xlog_test_footer(struct xlog *log);
extern int xlog_recover(struct xlog *log, int readonly);
-extern void xlog_recover_print_data(xfs_caddr_t p, int len);
+extern void xlog_recover_print_data(char *p, int len);
extern void xlog_recover_print_logitem(xlog_recover_item_t *item);
extern void xlog_recover_print_trans_head(xlog_recover_t *tr);
extern int xlog_print_find_oldest(struct xlog *log, xfs_daddr_t *last_blk);
diff --git a/include/linux.h b/include/linux.h
index e7a3cb2..31c077a 100644
--- a/include/linux.h
+++ b/include/linux.h
@@ -142,6 +142,5 @@
typedef __uint64_t xfs_ino_t;
typedef __uint32_t xfs_dev_t;
typedef __int64_t xfs_daddr_t;
-typedef char* xfs_caddr_t;
#endif /* __XFS_LINUX_H__ */
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 61c0d6b..4e0c75b 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -132,7 +132,7 @@
memcpy((char *)p + sizeof(xlog_op_header_t), &magic, sizeof(magic));
}
-static xfs_caddr_t next(xfs_caddr_t ptr, int offset, void *private)
+static char *next(char *ptr, int offset, void *private)
{
xfs_buf_t *buf = (xfs_buf_t *)private;
@@ -173,7 +173,7 @@
int
libxfs_log_header(
- xfs_caddr_t caddr,
+ char *caddr,
uuid_t *fs_uuid,
int version,
int sunit,
@@ -182,7 +182,7 @@
void *private)
{
xlog_rec_header_t *head = (xlog_rec_header_t *)caddr;
- xfs_caddr_t p = caddr;
+ char *p = caddr;
__be32 cycle_lsn;
int i, len;
diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index 5cadb2d..a80c431 100644
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -93,7 +93,7 @@
* Return the address of the start of the given block number's data
* in a log buffer. The buffer covers a log sector-aligned region.
*/
-STATIC xfs_caddr_t
+STATIC char *
xlog_align(
struct xlog *log,
xfs_daddr_t blk_no,
@@ -143,7 +143,7 @@
xfs_daddr_t blk_no,
int nbblks,
struct xfs_buf *bp,
- xfs_caddr_t *offset)
+ char **offset)
{
int error;
@@ -165,9 +165,9 @@
xfs_daddr_t blk_no, /* block to read from */
int nbblks, /* blocks to read */
struct xfs_buf *bp,
- xfs_caddr_t offset)
+ char *offset)
{
- xfs_caddr_t orig_offset = bp->b_addr;
+ char *orig_offset = bp->b_addr;
int orig_len = bp->b_bcount;
int error, error2;
@@ -198,7 +198,7 @@
xfs_daddr_t *last_blk,
uint cycle)
{
- xfs_caddr_t offset;
+ char *offset;
xfs_daddr_t mid_blk;
xfs_daddr_t end_blk;
uint mid_cycle;
@@ -245,7 +245,7 @@
uint cycle;
xfs_buf_t *bp;
xfs_daddr_t bufblks;
- xfs_caddr_t buf = NULL;
+ char *buf = NULL;
int error = 0;
/*
@@ -311,7 +311,7 @@
{
xfs_daddr_t i;
xfs_buf_t *bp;
- xfs_caddr_t offset = NULL;
+ char *offset = NULL;
xlog_rec_header_t *head = NULL;
int error = 0;
int smallmem = 0;
@@ -418,7 +418,7 @@
xfs_daddr_t *return_head_blk)
{
xfs_buf_t *bp;
- xfs_caddr_t offset;
+ char *offset;
xfs_daddr_t new_blk, first_blk, start_blk, last_blk, head_blk;
int num_scan_bblks;
uint first_half_cycle, last_half_cycle;
@@ -691,7 +691,7 @@
{
xlog_rec_header_t *rhead;
xlog_op_header_t *op_head;
- xfs_caddr_t offset = NULL;
+ char *offset = NULL;
xfs_buf_t *bp;
int error, i, found;
xfs_daddr_t umount_data_blk;
@@ -899,7 +899,7 @@
xfs_daddr_t *blk_no)
{
xfs_buf_t *bp;
- xfs_caddr_t offset;
+ char *offset;
uint first_cycle, last_cycle;
xfs_daddr_t new_blk, last_blk, start_blk;
xfs_daddr_t num_scan_bblks;
@@ -1041,17 +1041,17 @@
xlog_recover_add_to_cont_trans(
struct xlog *log,
struct xlog_recover *trans,
- xfs_caddr_t dp,
+ char *dp,
int len)
{
xlog_recover_item_t *item;
- xfs_caddr_t ptr, old_ptr;
+ char *ptr, *old_ptr;
int old_len;
if (list_empty(&trans->r_itemq)) {
/* finish copying rest of trans header */
xlog_recover_add_item(&trans->r_itemq);
- ptr = (xfs_caddr_t) &trans->r_theader +
+ ptr = (char *) &trans->r_theader +
sizeof(xfs_trans_header_t) - len;
memcpy(ptr, dp, len); /* d, s, l */
return 0;
@@ -1087,12 +1087,12 @@
xlog_recover_add_to_trans(
struct xlog *log,
struct xlog_recover *trans,
- xfs_caddr_t dp,
+ char *dp,
int len)
{
xfs_inode_log_format_t *in_f; /* any will do */
xlog_recover_item_t *item;
- xfs_caddr_t ptr;
+ char *ptr;
if (!len)
return 0;
@@ -1219,10 +1219,10 @@
struct xlog *log,
struct hlist_head rhash[],
struct xlog_rec_header *rhead,
- xfs_caddr_t dp,
+ char *dp,
int pass)
{
- xfs_caddr_t lp;
+ char *lp;
int num_logops;
xlog_op_header_t *ohead;
xlog_recover_t *trans;
@@ -1322,7 +1322,7 @@
STATIC int
xlog_unpack_data_crc(
struct xlog_rec_header *rhead,
- xfs_caddr_t dp,
+ char *dp,
struct xlog *log)
{
__le32 crc;
@@ -1352,7 +1352,7 @@
STATIC int
xlog_unpack_data(
struct xlog_rec_header *rhead,
- xfs_caddr_t dp,
+ char *dp,
struct xlog *log)
{
int i, j, k;
@@ -1434,7 +1434,7 @@
{
xlog_rec_header_t *rhead;
xfs_daddr_t blk_no;
- xfs_caddr_t offset;
+ char *offset;
xfs_buf_t *hbp, *dbp;
int error = 0, h_size;
int bblks, split_bblks;
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 315f69d..7ea6edc 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -119,7 +119,7 @@
void
xlog_print_op_header(xlog_op_header_t *op_head,
int i,
- xfs_caddr_t *ptr)
+ char **ptr)
{
xlog_op_header_t hbuf;
@@ -208,10 +208,10 @@
} /* xlog_print_find_tid */
int
-xlog_print_trans_header(xfs_caddr_t *ptr, int len)
+xlog_print_trans_header(char **ptr, int len)
{
xfs_trans_header_t *h;
- xfs_caddr_t cptr = *ptr;
+ char *cptr = *ptr;
__uint32_t magic;
char *magic_c = (char *)&magic;
@@ -240,7 +240,7 @@
int
-xlog_print_trans_buffer(xfs_caddr_t *ptr, int len, int *i, int num_ops)
+xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops)
{
xfs_buf_log_format_t *f;
xfs_agi_t *agi;
@@ -466,7 +466,7 @@
int
-xlog_print_trans_efd(xfs_caddr_t *ptr, uint len)
+xlog_print_trans_efd(char **ptr, uint len)
{
xfs_efd_log_format_t *f;
xfs_efd_log_format_t lbuf;
@@ -496,7 +496,7 @@
int
xlog_print_trans_efi(
- xfs_caddr_t *ptr,
+ char **ptr,
uint src_len,
int continued)
{
@@ -560,7 +560,7 @@
int
-xlog_print_trans_qoff(xfs_caddr_t *ptr, uint len)
+xlog_print_trans_qoff(char **ptr, uint len)
{
xfs_qoff_logformat_t *f;
xfs_qoff_logformat_t lbuf;
@@ -637,7 +637,7 @@
int
xlog_print_trans_inode(
struct xlog *log,
- xfs_caddr_t *ptr,
+ char **ptr,
int len,
int *i,
int num_ops,
@@ -778,7 +778,7 @@
int
-xlog_print_trans_dquot(xfs_caddr_t *ptr, int len, int *i, int num_ops)
+xlog_print_trans_dquot(char **ptr, int len, int *i, int num_ops)
{
xfs_dq_logformat_t *f;
xfs_dq_logformat_t lbuf = {0};
@@ -834,7 +834,7 @@
STATIC int
xlog_print_trans_icreate(
- xfs_caddr_t *ptr,
+ char **ptr,
int len,
int *i,
int num_ops)
@@ -886,7 +886,7 @@
void
-print_lsn(xfs_caddr_t string,
+print_lsn(char *string,
__be64 *lsn)
{
printf("%s: %u,%u", string,
@@ -901,12 +901,12 @@
int num_ops,
int len,
int *read_type,
- xfs_caddr_t *partial_buf,
+ char **partial_buf,
xlog_rec_header_t *rhead,
xlog_rec_ext_header_t *xhdrs,
int bad_hdr_warn)
{
- xfs_caddr_t buf, ptr;
+ char *buf, *ptr;
int read_len, skip, lost_context = 0;
int ret, n, i, j, k;
@@ -923,13 +923,13 @@
/* read_type => don't malloc() new buffer, use old one */
if (*read_type == FULL_READ) {
- if ((ptr = buf = (xfs_caddr_t)malloc(read_len)) == NULL) {
+ if ((ptr = buf = malloc(read_len)) == NULL) {
fprintf(stderr, _("%s: xlog_print_record: malloc failed\n"), progname);
exit(1);
}
} else {
read_len -= *read_type;
- buf = (xfs_caddr_t)((intptr_t)(*partial_buf) + (intptr_t)(*read_type));
+ buf = (char *)((intptr_t)(*partial_buf) + (intptr_t)(*read_type));
ptr = *partial_buf;
}
if ((ret = (int) read(fd, buf, read_len)) == -1) {
@@ -1220,7 +1220,7 @@
} /* print_xlog_bad_zeroed */
static void
-print_xlog_bad_header(xfs_daddr_t blkno, xfs_caddr_t buf)
+print_xlog_bad_header(xfs_daddr_t blkno, char *buf)
{
print_stars();
printf(_("* ERROR: header cycle=%-11d block=%-21lld *\n"),
@@ -1358,7 +1358,7 @@
xfs_daddr_t block_end = 0, block_start, blkno, error;
xfs_daddr_t zeroed_blkno = 0, cleared_blkno = 0;
int read_type = FULL_READ;
- xfs_caddr_t partial_buf;
+ char *partial_buf;
int zeroed = 0;
int cleared = 0;
int first_hdr_found = 0;
diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index bb90324..6569968 100644
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -57,7 +57,7 @@
void
xlog_recover_print_data(
- xfs_caddr_t p,
+ char *p,
int len)
{
if (print_data) {
@@ -85,7 +85,7 @@
xfs_agi_t *agi;
xfs_agf_t *agf;
xfs_buf_log_format_t *f;
- xfs_caddr_t p;
+ char *p;
int len, num, i;
xfs_daddr_t blkno;
xfs_disk_dquot_t *ddq;
