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 59af1602980764a50302f80ba0ebf6c5d6360cdc..dd4aa6d3838990b69a99ca499dd8b4804e7c98a8 100644 (file)
--- 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 b33f86a9565584c52335eb2ab4ae90f1906a0c87..b80683d4601a9bebd7a766367f4ac36570986cd0 100644 (file)
--- 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 22327f397c6e3dd3e38f5b6bbfb99f561b71c1c0..099ba44597ccecd15f2bf93206130c4e09741118 100644 (file)
--- 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 2c331b8167dd67deaaefcb1a679728232a63b335..edbc21bc3c32302f8c2accbce2010d43a09e80cd 100644 (file)
--- 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 54b46b09e0e2953d9d46ab5a4f6b25312724d2b8..1c35644e2d99d377c02ff2c8221fccb550bb5f27 100644 (file)
--- 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);