Convert all uint32/16/8 to _t in source3/libsmb.

[bbaumbach/samba-autobuild/.git] / source3 / libsmb / clifsinfo.c

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 5a75161e3a67c155d2f3c9d159ce976310f61345..3fbfbbe67a617d508c2a7150f2d15efa986c5dd7 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -120,12 +120,12 @@ NTSTATUS cli_unix_extensions_version_recv(struct tevent_req *req,
        return NT_STATUS_OK;
 }
 
-NTSTATUS cli_unix_extensions_version(struct cli_state *cli, uint16 *pmajor,
-                                    uint16 *pminor, uint32 *pcaplow,
-                                    uint32 *pcaphigh)
+NTSTATUS cli_unix_extensions_version(struct cli_state *cli, uint16_t *pmajor,
+                                    uint16_t *pminor, uint32_t *pcaplow,
+                                    uint32_t *pcaphigh)
 {
        TALLOC_CTX *frame = talloc_stackframe();
-       struct event_context *ev;
+       struct tevent_context *ev;
        struct tevent_req *req;
        NTSTATUS status = NT_STATUS_OK;
 
@@ -137,7 +137,7 @@ NTSTATUS cli_unix_extensions_version(struct cli_state *cli, uint16 *pmajor,
                goto fail;
        }
 
-       ev = event_context_init(frame);
+       ev = samba_tevent_context_init(frame);
        if (ev == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto fail;
@@ -235,8 +235,8 @@ NTSTATUS cli_set_unix_extensions_capabilities_recv(struct tevent_req *req)
 }
 
 NTSTATUS cli_set_unix_extensions_capabilities(struct cli_state *cli,
-                                             uint16 major, uint16 minor,
-                                             uint32 caplow, uint32 caphigh)
+                                             uint16_t major, uint16 minor,
+                                             uint32_t caplow, uint32 caphigh)
 {
        struct tevent_context *ev;
        struct tevent_req *req;
@@ -245,7 +245,7 @@ NTSTATUS cli_set_unix_extensions_capabilities(struct cli_state *cli,
        if (smbXcli_conn_has_async_calls(cli->conn)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                goto fail;
        }
@@ -342,7 +342,7 @@ NTSTATUS cli_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr)
        if (smbXcli_conn_has_async_calls(cli->conn)) {
                return NT_STATUS_INVALID_PARAMETER;
        }
-       ev = tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(talloc_tos());
        if (ev == NULL) {
                goto fail;
        }
@@ -432,7 +432,7 @@ NTSTATUS cli_get_fs_full_size_info(struct cli_state *cli,
                                   uint64_t *sectors_per_allocation_unit,
                                   uint64_t *bytes_per_sector)
 {
-       uint16 setup[1];
+       uint16_t setup[1];
        uint8_t param[2];
        uint8_t *rdata = NULL;
        uint32_t rdata_count;
@@ -476,8 +476,8 @@ fail:
 }
 
 NTSTATUS cli_get_posix_fs_info(struct cli_state *cli,
-                              uint32 *optimal_transfer_size,
-                              uint32 *block_size,
+                              uint32_t *optimal_transfer_size,
+                              uint32_t *block_size,
                               uint64_t *total_blocks,
                               uint64_t *blocks_available,
                               uint64_t *user_blocks_available,
@@ -485,7 +485,7 @@ NTSTATUS cli_get_posix_fs_info(struct cli_state *cli,
                               uint64_t *free_file_nodes,
                               uint64_t *fs_identifier)
 {
-       uint16 setup[1];
+       uint16_t setup[1];
        uint8_t param[2];
        uint8_t *rdata = NULL;
        uint32_t rdata_count;
@@ -615,7 +615,7 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli,
 
        do {
                status = gensec_update(auth_generic_state->gensec_security, auth_generic_state,
-                                      NULL, blob_in, &blob_out);
+                                      blob_in, &blob_out);
                data_blob_free(&blob_in);
                data_blob_free(&param_out);
                if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) || NT_STATUS_IS_OK(status)) {
@@ -700,7 +700,7 @@ NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
        }
 
        status = gensec_update(auth_generic_state->gensec_security, talloc_tos(),
-                              NULL, blob_recv, &blob_send);
+                              blob_recv, &blob_send);
 
        do {
                data_blob_free(&blob_recv);
@@ -710,7 +710,7 @@ NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
                }
                data_blob_free(&blob_send);
                status = gensec_update(auth_generic_state->gensec_security, talloc_tos(),
-                                      NULL, blob_recv, &blob_send);
+                                      blob_recv, &blob_send);
        } while (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED));
        data_blob_free(&blob_recv);
 
@@ -748,8 +748,8 @@ NTSTATUS cli_force_encryption(struct cli_state *c,
                        const char *password,
                        const char *domain)
 {
-       uint16 major, minor;
-       uint32 caplow, caphigh;
+       uint16_t major, minor;
+       uint32_t caplow, caphigh;
        NTSTATUS status;
 
        if (!SERVER_HAS_UNIX_CIFS(c)) {