s3: libsmb: clifile.c: Rename all uint16_t *attr parameters to uint16_t *pattr.

Will make it easier to move to 32 bit attributes later.

No logic changes, just a rename.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index f2b12475b5beb8d8ff997bbef578c655b4d04d96..5ece9b61421c437ec0f583e81b08557b9e707896 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -4110,7 +4110,7 @@ static void cli_getattrE_done(struct tevent_req *subreq)
 }
 
 NTSTATUS cli_getattrE_recv(struct tevent_req *req,
-                       uint16_t *attr,
+                       uint16_t *pattr,
                        off_t *size,
                        time_t *change_time,
                        time_t *access_time,
@@ -4123,8 +4123,8 @@ NTSTATUS cli_getattrE_recv(struct tevent_req *req,
        if (tevent_req_is_nterror(req, &status)) {
                return status;
        }
-       if (attr) {
-               *attr = state->attr;
+       if (pattr) {
+               *pattr = state->attr;
        }
        if (size) {
                *size = state->size;
@@ -4143,7 +4143,7 @@ NTSTATUS cli_getattrE_recv(struct tevent_req *req,
 
 NTSTATUS cli_getattrE(struct cli_state *cli,
                        uint16_t fnum,
-                       uint16_t *attr,
+                       uint16_t *pattr,
                        off_t *size,
                        time_t *change_time,
                        time_t *access_time,
@@ -4157,7 +4157,7 @@ NTSTATUS cli_getattrE(struct cli_state *cli,
        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
                return cli_smb2_getattrE(cli,
                                        fnum,
-                                       attr,
+                                       pattr,
                                        size,
                                        change_time,
                                        access_time,
@@ -4191,7 +4191,7 @@ NTSTATUS cli_getattrE(struct cli_state *cli,
        }
 
        status = cli_getattrE_recv(req,
-                                       attr,
+                                       pattr,
                                        size,
                                        change_time,
                                        access_time,
@@ -4284,7 +4284,7 @@ static void cli_getatr_done(struct tevent_req *subreq)
 }
 
 NTSTATUS cli_getatr_recv(struct tevent_req *req,
-                       uint16_t *attr,
+                       uint16_t *pattr,
                        off_t *size,
                        time_t *write_time)
 {
@@ -4295,8 +4295,8 @@ NTSTATUS cli_getatr_recv(struct tevent_req *req,
        if (tevent_req_is_nterror(req, &status)) {
                return status;
        }
-       if (attr) {
-               *attr = state->attr;
+       if (pattr) {
+               *pattr = state->attr;
        }
        if (size) {
                *size = state->size;
@@ -4309,7 +4309,7 @@ NTSTATUS cli_getatr_recv(struct tevent_req *req,
 
 NTSTATUS cli_getatr(struct cli_state *cli,
                        const char *fname,
-                       uint16_t *attr,
+                       uint16_t *pattr,
                        off_t *size,
                        time_t *write_time)
 {
@@ -4321,7 +4321,7 @@ NTSTATUS cli_getatr(struct cli_state *cli,
        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
                return cli_smb2_getatr(cli,
                                        fname,
-                                       attr,
+                                       pattr,
                                        size,
                                        write_time);
        }
@@ -4353,7 +4353,7 @@ NTSTATUS cli_getatr(struct cli_state *cli,
        }
 
        status = cli_getatr_recv(req,
-                               attr,
+                               pattr,
                                size,
                                write_time);
 

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 9334825210d63ddb5677fcb283a9214e486ec009..40f8433a6e1a60eb034bb2dfcfbefc11292edc3b 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -518,14 +518,14 @@ struct tevent_req *cli_getattrE_send(TALLOC_CTX *mem_ctx,
                                struct cli_state *cli,
                                 uint16_t fnum);
 NTSTATUS cli_getattrE_recv(struct tevent_req *req,
-                        uint16_t *attr,
+                        uint16_t *pattr,
                         off_t *size,
                         time_t *change_time,
                         time_t *access_time,
                         time_t *write_time);
 NTSTATUS cli_getattrE(struct cli_state *cli,
                        uint16_t fnum,
-                       uint16_t *attr,
+                       uint16_t *pattr,
                        off_t *size,
                        time_t *change_time,
                        time_t *access_time,
@@ -548,12 +548,12 @@ struct tevent_req *cli_getatr_send(TALLOC_CTX *mem_ctx,
                                struct cli_state *cli,
                                const char *fname);
 NTSTATUS cli_getatr_recv(struct tevent_req *req,
-                               uint16_t *attr,
+                               uint16_t *pattr,
                                off_t *size,
                                time_t *write_time);
 NTSTATUS cli_getatr(struct cli_state *cli,
                        const char *fname,
-                       uint16_t *attr,
+                       uint16_t *pattr,
                        off_t *size,
                        time_t *write_time);
 struct tevent_req *cli_setatr_send(TALLOC_CTX *mem_ctx,