From: Volker Lendecke <vl@samba.org>
Date: Fri, 17 May 2024 14:05:19 +0000 (+0200)
Subject: libsmb: Execute a "TODO", remove IVAL2_TO_SMB_BIG_UINT
X-Git-Tag: tdb-1.4.11~615
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ecf3b0e25c5607bcae50a42ee33164ffe118868;p=thirdparty%2Fsamba.git

libsmb: Execute a "TODO", remove IVAL2_TO_SMB_BIG_UINT

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/examples/fuse/clifuse.c b/examples/fuse/clifuse.c
index 59af1602980..dd4aa6d3838 100644
--- a/examples/fuse/clifuse.c
+++ b/examples/fuse/clifuse.c
@@ -506,7 +506,7 @@ static NTSTATUS parse_finfo_id_both_directory_info(uint8_t *dir_data,
 	finfo->atime_ts = interpret_long_date(BVAL(dir_data, 16));
 	finfo->mtime_ts = interpret_long_date(BVAL(dir_data, 24));
 	finfo->ctime_ts = interpret_long_date(BVAL(dir_data, 32));
-	finfo->size = IVAL2_TO_SMB_BIG_UINT(dir_data + 40, 0);
+	finfo->size = BVAL(dir_data + 40, 0);
 	finfo->attr = IVAL(dir_data + 56, 0);
 	namelen = IVAL(dir_data + 60,0);
 	if (namelen > (dir_data_length - 104)) {
diff --git a/source3/include/includes.h b/source3/include/includes.h
index b33f86a9565..b80683d4601 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -165,7 +165,6 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
 /* TODO: remove this macros */
 #define SBIG_UINT(p, ofs, v) SBVAL(p, ofs, v)
 #define BIG_UINT(p, ofs) BVAL(p, ofs)
-#define IVAL2_TO_SMB_BIG_UINT(p, ofs) BVAL(p, ofs)
 
 /*
  * Set the define that tells us if we can do 64 bit
diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 22327f397c6..099ba44597c 100644
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -1335,10 +1335,10 @@ static NTSTATUS parse_finfo_id_both_directory_info(const uint8_t *dir_data,
 	finfo->atime_ts = interpret_long_date(BVAL(dir_data, 16));
 	finfo->mtime_ts = interpret_long_date(BVAL(dir_data, 24));
 	finfo->ctime_ts = interpret_long_date(BVAL(dir_data, 32));
-	finfo->size = IVAL2_TO_SMB_BIG_UINT(dir_data + 40, 0);
-	finfo->allocated_size = IVAL2_TO_SMB_BIG_UINT(dir_data + 48, 0);
+	finfo->size = BVAL(dir_data + 40, 0);
+	finfo->allocated_size = BVAL(dir_data + 48, 0);
 	finfo->attr = IVAL(dir_data + 56, 0);
-	finfo->ino = IVAL2_TO_SMB_BIG_UINT(dir_data + 96, 0);
+	finfo->ino = BVAL(dir_data + 96, 0);
 	namelen = IVAL(dir_data + 60,0);
 	if (namelen > (dir_data_length - 104)) {
 		return NT_STATUS_INFO_LENGTH_MISMATCH;
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 2c331b8167d..edbc21bc3c3 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -841,10 +841,10 @@ static void cli_posix_stat_done(struct tevent_req *subreq)
 	}
 
 	/* total size, in bytes */
-	sbuf->st_ex_size = IVAL2_TO_SMB_BIG_UINT(data, 0);
+	sbuf->st_ex_size = BVAL(data, 0);
 
 	/* number of blocks allocated */
-	sbuf->st_ex_blocks = IVAL2_TO_SMB_BIG_UINT(data,8);
+	sbuf->st_ex_blocks = BVAL(data,8);
 #if defined (HAVE_STAT_ST_BLOCKS) && defined(STAT_ST_BLOCKSIZE)
 	sbuf->st_ex_blocks /= STAT_ST_BLOCKSIZE;
 #else
@@ -872,7 +872,7 @@ static void cli_posix_stat_done(struct tevent_req *subreq)
 	}
 #endif
 	/* inode */
-	sbuf->st_ex_ino = (SMB_INO_T)IVAL2_TO_SMB_BIG_UINT(data, 76);
+	sbuf->st_ex_ino = (SMB_INO_T)BVAL(data, 76);
 
 	/* protection */
 	sbuf->st_ex_mode |= wire_perms_to_unix(IVAL(data, 84));
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 54b46b09e0e..1c35644e2d9 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -254,7 +254,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
 			p += 8;
 			finfo->ctime_ts = interpret_long_date(BVAL(p, 0));
 			p += 8;
-			finfo->size = IVAL2_TO_SMB_BIG_UINT(p,0);
+			finfo->size = BVAL(p,0);
 			p += 8;
 			p += 8; /* alloc size */
 			finfo->attr = IVAL(p,0);