From: Ralph Boehme Date: Mon, 10 Mar 2025 15:18:30 +0000 (+0100) Subject: smbtorture: change variable name in SET_INFO_FILE_EX macro X-Git-Tag: tevent-0.17.0~500 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43ed3456d9ba4b90efe07dbaefcf85fff9b538d7;p=thirdparty%2Fsamba.git smbtorture: change variable name in SET_INFO_FILE_EX macro Allows using the variable name sfinfo in functions that use the macro. No change in behaviour. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13594 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 7be29af1d37..3b628ff4a82 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -1354,15 +1354,15 @@ static bool test_finfo_after_write(struct torture_context *tctx, struct smbcli_s #define SET_INFO_FILE_EX(finfo, wrtime, tree, tfnum) do { \ NTSTATUS _status; \ - union smb_setfileinfo sfinfo; \ - sfinfo.basic_info.level = RAW_SFILEINFO_BASIC_INFO; \ - sfinfo.basic_info.in.file.fnum = tfnum; \ - sfinfo.basic_info.in.create_time = 0; \ - sfinfo.basic_info.in.access_time = 0; \ - unix_to_nt_time(&sfinfo.basic_info.in.write_time, (wrtime)); \ - sfinfo.basic_info.in.change_time = 0; \ - sfinfo.basic_info.in.attrib = finfo.basic_info.out.attrib; \ - _status = smb_raw_setfileinfo(tree, &sfinfo); \ + union smb_setfileinfo _sfinfo; \ + _sfinfo.basic_info.level = RAW_SFILEINFO_BASIC_INFO; \ + _sfinfo.basic_info.in.file.fnum = tfnum; \ + _sfinfo.basic_info.in.create_time = 0; \ + _sfinfo.basic_info.in.access_time = 0; \ + unix_to_nt_time(&_sfinfo.basic_info.in.write_time, (wrtime)); \ + _sfinfo.basic_info.in.change_time = 0; \ + _sfinfo.basic_info.in.attrib = finfo.basic_info.out.attrib; \ + _status = smb_raw_setfileinfo(tree, &_sfinfo); \ if (!NT_STATUS_IS_OK(_status)) { \ torture_result(tctx, TORTURE_FAIL, __location__": setfileinfo failed: %s", \ nt_errstr(_status)); \