From 78fce47fc23173885143b730552599023c845963 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 16 Sep 2019 05:26:05 -0700 Subject: [PATCH] smbd: Use direct struct assignments in smbXsrv_*.c Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/smbd/smbXsrv_client.c | 27 ++++++++++++-------------- source3/smbd/smbXsrv_open.c | 35 +++++++++++++++------------------- source3/smbd/smbXsrv_session.c | 18 ++++++++--------- source3/smbd/smbXsrv_tcon.c | 18 ++++++++--------- 4 files changed, 43 insertions(+), 55 deletions(-) diff --git a/source3/smbd/smbXsrv_client.c b/source3/smbd/smbXsrv_client.c index 6db34d7c174..02754a88dd5 100644 --- a/source3/smbd/smbXsrv_client.c +++ b/source3/smbd/smbXsrv_client.c @@ -533,13 +533,12 @@ NTSTATUS smbXsrv_client_create(TALLOC_CTX *mem_ctx, talloc_set_destructor(client, smbXsrv_client_destructor); if (DEBUGLVL(DBGLVL_DEBUG)) { - struct smbXsrv_clientB client_blob; + struct smbXsrv_clientB client_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = client, + }; struct GUID_txt_buf buf; - ZERO_STRUCT(client_blob); - client_blob.version = SMBXSRV_VERSION_0; - client_blob.info.info0 = client; - DBG_DEBUG("client_guid[%s] stored\n", GUID_buf_string(&global->client_guid, &buf)); NDR_PRINT_DEBUG(smbXsrv_clientB, &client_blob); @@ -732,13 +731,12 @@ NTSTATUS smbXsrv_client_update(struct smbXsrv_client *client) } if (DEBUGLVL(DBGLVL_DEBUG)) { - struct smbXsrv_clientB client_blob; + struct smbXsrv_clientB client_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = client, + }; struct GUID_txt_buf buf; - ZERO_STRUCT(client_blob); - client_blob.version = SMBXSRV_VERSION_0; - client_blob.info.info0 = client; - DBG_DEBUG("client_guid[%s] stored\n", GUID_buf_string(&client->global->client_guid, &buf)); @@ -783,13 +781,12 @@ NTSTATUS smbXsrv_client_remove(struct smbXsrv_client *client) } if (DEBUGLVL(DBGLVL_DEBUG)) { - struct smbXsrv_clientB client_blob; + struct smbXsrv_clientB client_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = client, + }; struct GUID_txt_buf buf; - ZERO_STRUCT(client_blob); - client_blob.version = SMBXSRV_VERSION_0; - client_blob.info.info0 = client; - DBG_DEBUG("client_guid[%s] stored\n", GUID_buf_string(&client->global->client_guid, &buf)); NDR_PRINT_DEBUG(smbXsrv_clientB, &client_blob); diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c index 23fd96ef0ef..142406f140a 100644 --- a/source3/smbd/smbXsrv_open.c +++ b/source3/smbd/smbXsrv_open.c @@ -901,11 +901,10 @@ NTSTATUS smbXsrv_open_create(struct smbXsrv_connection *conn, } if (CHECK_DEBUGLVL(10)) { - struct smbXsrv_openB open_blob; - - ZERO_STRUCT(open_blob); - open_blob.version = SMBXSRV_VERSION_0; - open_blob.info.info0 = op; + struct smbXsrv_openB open_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = op, + }; DEBUG(10,("smbXsrv_open_create: global_id (0x%08x) stored\n", op->global->open_global_id)); @@ -1046,11 +1045,10 @@ NTSTATUS smbXsrv_open_update(struct smbXsrv_open *op) } if (CHECK_DEBUGLVL(10)) { - struct smbXsrv_openB open_blob; - - ZERO_STRUCT(open_blob); - open_blob.version = SMBXSRV_VERSION_0; - open_blob.info.info0 = op; + struct smbXsrv_openB open_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = op, + }; DEBUG(10,("smbXsrv_open_update: global_id (0x%08x) stored\n", op->global->open_global_id)); @@ -1120,11 +1118,10 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now) } if (NT_STATUS_IS_OK(status) && CHECK_DEBUGLVL(10)) { - struct smbXsrv_openB open_blob; - - ZERO_STRUCT(open_blob); - open_blob.version = SMBXSRV_VERSION_0; - open_blob.info.info0 = op; + struct smbXsrv_openB open_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = op, + }; DEBUG(10,("smbXsrv_open_close(0x%08x): " "stored disconnect\n", @@ -1437,11 +1434,9 @@ NTSTATUS smb2srv_open_recreate(struct smbXsrv_connection *conn, } if (CHECK_DEBUGLVL(10)) { - struct smbXsrv_openB open_blob; - - ZERO_STRUCT(open_blob); - open_blob.version = 0; - open_blob.info.info0 = op; + struct smbXsrv_openB open_blob = { + .info.info0 = op, + }; DEBUG(10,("smbXsrv_open_recreate: global_id (0x%08x) stored\n", op->global->open_global_id)); diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c index 47bf8632a34..91fa0005737 100644 --- a/source3/smbd/smbXsrv_session.c +++ b/source3/smbd/smbXsrv_session.c @@ -1321,11 +1321,10 @@ NTSTATUS smbXsrv_session_create(struct smbXsrv_connection *conn, } if (DEBUGLVL(10)) { - struct smbXsrv_sessionB session_blob; - - ZERO_STRUCT(session_blob); - session_blob.version = SMBXSRV_VERSION_0; - session_blob.info.info0 = session; + struct smbXsrv_sessionB session_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = session, + }; DEBUG(10,("smbXsrv_session_create: global_id (0x%08x) stored\n", session->global->session_global_id)); @@ -1416,11 +1415,10 @@ NTSTATUS smbXsrv_session_update(struct smbXsrv_session *session) } if (DEBUGLVL(10)) { - struct smbXsrv_sessionB session_blob; - - ZERO_STRUCT(session_blob); - session_blob.version = SMBXSRV_VERSION_0; - session_blob.info.info0 = session; + struct smbXsrv_sessionB session_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = session, + }; DEBUG(10,("smbXsrv_session_update: global_id (0x%08x) stored\n", session->global->session_global_id)); diff --git a/source3/smbd/smbXsrv_tcon.c b/source3/smbd/smbXsrv_tcon.c index ded4010f5da..f7f4cd2aefb 100644 --- a/source3/smbd/smbXsrv_tcon.c +++ b/source3/smbd/smbXsrv_tcon.c @@ -830,11 +830,10 @@ static NTSTATUS smbXsrv_tcon_create(struct smbXsrv_tcon_table *table, } if (DEBUGLVL(10)) { - struct smbXsrv_tconB tcon_blob; - - ZERO_STRUCT(tcon_blob); - tcon_blob.version = SMBXSRV_VERSION_0; - tcon_blob.info.info0 = tcon; + struct smbXsrv_tconB tcon_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = tcon, + }; DEBUG(10,("smbXsrv_tcon_create: global_id (0x%08x) stored\n", tcon->global->tcon_global_id)); @@ -875,11 +874,10 @@ NTSTATUS smbXsrv_tcon_update(struct smbXsrv_tcon *tcon) } if (DEBUGLVL(10)) { - struct smbXsrv_tconB tcon_blob; - - ZERO_STRUCT(tcon_blob); - tcon_blob.version = SMBXSRV_VERSION_0; - tcon_blob.info.info0 = tcon; + struct smbXsrv_tconB tcon_blob = { + .version = SMBXSRV_VERSION_0, + .info.info0 = tcon, + }; DEBUG(10,("smbXsrv_tcon_update: global_id (0x%08x) stored\n", tcon->global->tcon_global_id)); -- 2.47.3