]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: libsmb: Rename uint16_t attr -> sattr (short attributes).
authorJeremy Allison <jra@samba.org>
Wed, 3 Jun 2020 20:09:43 +0000 (13:09 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 4 Jun 2020 17:11:37 +0000 (17:11 +0000)
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>
source3/libsmb/libsmb_file.c

index 92a629cecced8acc792991cfd91e0c880ef35f86..26bf9fb61edd53ba8739182bb054b808bbcd9677 100644 (file)
@@ -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,