build: Remove SMB_OFF_T, replace with off_t

Now that we always require a 64 bit off_t, we no longer need SMB_OFF_T.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Apr  6 01:47:43 CEST 2012 on sn-devel-104

4 files changed, 10 insertions, 10 deletions

diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index b845048ebe6..b6cc716a615 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -490,7 +490,7 @@ static NTSTATUS cmd_write(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
 static NTSTATUS cmd_lseek(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
 {
 	int fd, offset, whence;
-	SMB_OFF_T pos;
+	off_t pos;
 
 	if (argc != 4) {
 		printf("Usage: lseek <fd> <offset> <whence>\n...where whence is 1 => SEEK_SET, 2 => SEEK_CUR, 3 => SEEK_END\n");
@@ -507,7 +507,7 @@ static NTSTATUS cmd_lseek(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
 	}
 
 	pos = SMB_VFS_LSEEK(vfs->files[fd], offset, whence);
-	if (pos == (SMB_OFF_T)-1) {
+	if (pos == (off_t)-1) {
 		printf("lseek: error=%d (%s)\n", errno, strerror(errno));
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -936,7 +936,7 @@ static NTSTATUS cmd_utime(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
 static NTSTATUS cmd_ftruncate(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
 {
 	int fd;
-	SMB_OFF_T off;
+	off_t off;
 	if (argc != 3) {
 		printf("Usage: ftruncate <fd> <length>\n");
 		return NT_STATUS_OK;
diff --git a/source3/torture/test_posix_append.c b/source3/torture/test_posix_append.c
index 2f562633e50..d4784e8e7c2 100644
--- a/source3/torture/test_posix_append.c
+++ b/source3/torture/test_posix_append.c
@@ -33,7 +33,7 @@ bool run_posix_append(int dummy)
 	const char *fname = "append";
 	NTSTATUS status;
 	uint16_t fnum;
-	SMB_OFF_T size;
+	off_t size;
 	uint8_t c = '\0';
 	bool ret = false;
 
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 1e9e59b2805..5214e1319d1 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -984,7 +984,7 @@ static bool run_readwritelarge_internal(void)
 	static struct cli_state *cli1;
 	uint16_t fnum1;
 	const char *lockfname = "\\large.dat";
-	SMB_OFF_T fsize;
+	off_t fsize;
 	char buf[126*1024];
 	bool correct = True;
 	NTSTATUS status;
@@ -3281,7 +3281,7 @@ static bool run_trans2test(int dummy)
 {
 	struct cli_state *cli;
 	uint16_t fnum;
-	SMB_OFF_T size;
+	off_t size;
 	time_t c_time, a_time, m_time;
 	struct timespec c_time_ts, a_time_ts, m_time_ts, w_time_ts, m_time2_ts;
 	const char *fname = "\\trans2.tst";
@@ -4851,7 +4851,7 @@ static bool run_opentest(int dummy)
 	const char *fname = "\\readonly.file";
 	uint16_t fnum1, fnum2;
 	char buf[20];
-	SMB_OFF_T fsize;
+	off_t fsize;
 	bool correct = True;
 	char *tmp_path;
 	NTSTATUS status;
@@ -7016,7 +7016,7 @@ static bool run_mangle1(int dummy)
 	fstring alt_name;
 	NTSTATUS status;
 	time_t change_time, access_time, write_time;
-	SMB_OFF_T size;
+	off_t size;
 	uint16_t mode;
 
 	printf("starting mangle1 test\n");
@@ -7586,7 +7586,7 @@ static bool run_streamerror(int dummy)
 		"testdir:{4c8cc155-6c1e-11d1-8e41-00c04fb9386d}:$DATA";
 	NTSTATUS status;
 	time_t change_time, access_time, write_time;
-	SMB_OFF_T size;
+	off_t size;
 	uint16_t mode, fnum;
 	bool ret = true;
 
diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index 2a56f085fed..a2db3ba0fea 100644
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -153,7 +153,7 @@ bool torture_casetable(int dummy)
 	}
 
 	for (c=1; c < 0x10000; c++) {
-		SMB_OFF_T size;
+		off_t size;
 
 		if (c == '.' || c == '\\') continue;