diff options
author | Tim Potter <tpot@samba.org> | 2005-11-30 02:08:15 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:46:52 -0500 |
commit | 03d301ead5f702872b8cb948b8cd01b0fa0db5f7 (patch) | |
tree | bfecef5d67424c708c0122b591458328f6138ce1 /source4/torture/smb2 | |
parent | ad02b0bee4c8554499e02e93903e64d599c11475 (diff) | |
download | samba-03d301ead5f702872b8cb948b8cd01b0fa0db5f7.tar.gz samba-03d301ead5f702872b8cb948b8cd01b0fa0db5f7.tar.xz samba-03d301ead5f702872b8cb948b8cd01b0fa0db5f7.zip |
r11967: Fix more 64-bit warnings.
(This used to be commit 9c4436a124f874ae240feaf590141d48c33a635f)
Diffstat (limited to 'source4/torture/smb2')
-rw-r--r-- | source4/torture/smb2/connect.c | 12 | ||||
-rw-r--r-- | source4/torture/smb2/scan.c | 12 | ||||
-rw-r--r-- | source4/torture/smb2/util.c | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c index 4973dcee6f..dde2ace4b2 100644 --- a/source4/torture/smb2/connect.c +++ b/source4/torture/smb2/connect.c @@ -51,8 +51,8 @@ static NTSTATUS torture_smb2_close(struct smb2_tree *tree, struct smb2_handle ha printf("access_time = %s\n", nt_time_string(tmp_ctx, io.out.access_time)); printf("write_time = %s\n", nt_time_string(tmp_ctx, io.out.write_time)); printf("change_time = %s\n", nt_time_string(tmp_ctx, io.out.change_time)); - printf("alloc_size = %lld\n", io.out.alloc_size); - printf("size = %lld\n", io.out.size); + printf("alloc_size = %lld\n", (long long)io.out.alloc_size); + printf("size = %lld\n", (long long)io.out.size); printf("file_attr = 0x%x\n", io.out.file_attr); } @@ -170,12 +170,12 @@ static struct smb2_handle torture_smb2_create(struct smb2_tree *tree, printf("access_time = %s\n", nt_time_string(tmp_ctx, io.out.access_time)); printf("write_time = %s\n", nt_time_string(tmp_ctx, io.out.write_time)); printf("change_time = %s\n", nt_time_string(tmp_ctx, io.out.change_time)); - printf("alloc_size = %lld\n", io.out.alloc_size); - printf("size = %lld\n", io.out.size); + printf("alloc_size = %lld\n", (long long)io.out.alloc_size); + printf("size = %lld\n", (long long)io.out.size); printf("file_attr = 0x%x\n", io.out.file_attr); printf("handle = %016llx%016llx\n", - io.out.handle.data[0], - io.out.handle.data[1]); + (long long)io.out.handle.data[0], + (long long)io.out.handle.data[1]); } talloc_free(tmp_ctx); diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index b0c4ba4c8d..03aa6dca49 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -78,8 +78,8 @@ BOOL torture_smb2_getinfo_scan(void) if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) && !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) && !NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) { - printf("file level 0x%04x is %d bytes - %s\n", - io.in.level, io.out.blob.length, nt_errstr(status)); + printf("file level 0x%04x is %ld bytes - %s\n", + io.in.level, (long)io.out.blob.length, nt_errstr(status)); dump_data(1, io.out.blob.data, io.out.blob.length); } @@ -88,8 +88,8 @@ BOOL torture_smb2_getinfo_scan(void) if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) && !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) && !NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) { - printf("dir level 0x%04x is %d bytes - %s\n", - io.in.level, io.out.blob.length, nt_errstr(status)); + printf("dir level 0x%04x is %ld bytes - %s\n", + io.in.level, (long)io.out.blob.length, nt_errstr(status)); dump_data(1, io.out.blob.data, io.out.blob.length); } } @@ -183,8 +183,8 @@ BOOL torture_smb2_find_scan(void) if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) && !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) && !NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) { - printf("find level 0x%04x is %d bytes - %s\n", - io.in.level, io.out.blob.length, nt_errstr(status)); + printf("find level 0x%04x is %ld bytes - %s\n", + io.in.level, (long)io.out.blob.length, nt_errstr(status)); dump_data(1, io.out.blob.data, io.out.blob.length); } } diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 886aaea09f..a3d6ed8d66 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -224,16 +224,16 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle) d_printf("\tchange_time: %s\n", nt_time_string(tmp_ctx, io.all_info2.out.change_time)); d_printf("\tattrib: 0x%x\n", io.all_info2.out.attrib); d_printf("\tunknown1: 0x%x\n", io.all_info2.out.unknown1); - d_printf("\talloc_size: %llu\n", (uint64_t)io.all_info2.out.alloc_size); - d_printf("\tsize: %llu\n", (uint64_t)io.all_info2.out.size); + d_printf("\talloc_size: %llu\n", (long long)io.all_info2.out.alloc_size); + d_printf("\tsize: %llu\n", (long long)io.all_info2.out.size); d_printf("\tnlink: %u\n", io.all_info2.out.nlink); d_printf("\tdelete_pending: %u\n", io.all_info2.out.delete_pending); d_printf("\tdirectory: %u\n", io.all_info2.out.directory); - d_printf("\tfile_id: %llu\n", io.all_info2.out.file_id); + d_printf("\tfile_id: %llu\n", (long long)io.all_info2.out.file_id); d_printf("\tea_size: %u\n", io.all_info2.out.ea_size); d_printf("\taccess_mask: 0x%08x\n", io.all_info2.out.access_mask); - d_printf("\tposition: 0x%llx\n", io.all_info2.out.position); - d_printf("\tmode: 0x%llx\n", io.all_info2.out.mode); + d_printf("\tposition: 0x%llx\n", (long long)io.all_info2.out.position); + d_printf("\tmode: 0x%llx\n", (long long)io.all_info2.out.mode); /* short name, if any */ io.generic.level = RAW_FILEINFO_ALT_NAME_INFORMATION; |