summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2020-06-03 13:09:43 -0700
committerJeremy Allison <jra@samba.org>2020-06-04 17:11:37 +0000
commit2f1fbb678b7cdd77cbd7d8c68df0b71752b07e46 (patch)
treefefe6128a26839862ca196bf747f3c39acfc41c8 /source3
parente2726bed8d9e020174401503124c7a2ae309866e (diff)
downloadsamba-2f1fbb678b7cdd77cbd7d8c68df0b71752b07e46.tar.gz
s3: libsmb: Rename uint16_t attr -> sattr (short attributes).
This will make it easier to add 32-bit attr value later. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/libsmb_file.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 92a629cecce..26bf9fb61ed 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -453,7 +453,7 @@ SMBC_getatr(SMBCCTX * context,
char *fixedpath = NULL;
char *targetpath = NULL;
struct cli_state *targetcli = NULL;
- uint16_t attr = 0;
+ uint16_t sattr = 0;
off_t size = 0;
struct timespec create_time_ts = {0};
struct timespec access_time_ts = {0};
@@ -508,7 +508,7 @@ SMBC_getatr(SMBCCTX * context,
&write_time_ts,
&change_time_ts,
&size,
- &attr,
+ &sattr,
&ino);
if (NT_STATUS_IS_OK(status)) {
goto setup_stat;
@@ -525,7 +525,7 @@ SMBC_getatr(SMBCCTX * context,
&write_time_ts,
&change_time_ts,
&size,
- &attr,
+ &sattr,
&ino);
if (NT_STATUS_IS_OK(status)) {
goto setup_stat;
@@ -539,7 +539,7 @@ SMBC_getatr(SMBCCTX * context,
goto all_failed;
}
- status = cli_getatr(targetcli, targetpath, &attr, &size, &write_time);
+ status = cli_getatr(targetcli, targetpath, &sattr, &size, &write_time);
if (NT_STATUS_IS_OK(status)) {
struct timespec w_time_ts =
convert_time_t_to_timespec(write_time);
@@ -553,7 +553,7 @@ setup_stat:
setup_stat(sb,
path,
size,
- attr,
+ sattr,
ino,
srv->dev,
access_time_ts,