From: Volker Lendecke Date: Thu, 17 Dec 2020 10:37:47 +0000 (+0100) Subject: lib: Slightly simplify server_id_set_disconnected() X-Git-Tag: tevent-0.11.0~653 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cb3e4314b00629391919d8f74080d0dfc1aae18;p=thirdparty%2Fsamba.git lib: Slightly simplify server_id_set_disconnected() The NULL assert is not really required, it will crash nicely if that's not fulfilled. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Jun 4 17:34:06 UTC 2021 on sn-devel-184 --- diff --git a/lib/util/server_id.c b/lib/util/server_id.c index e66c9791007..690b9ddfbdc 100644 --- a/lib/util/server_id.c +++ b/lib/util/server_id.c @@ -187,14 +187,12 @@ struct server_id server_id_from_string(uint32_t local_vnn, */ void server_id_set_disconnected(struct server_id *id) { - SMB_ASSERT(id != NULL); - - id->pid = UINT64_MAX; - id->task_id = UINT32_MAX; - id->vnn = NONCLUSTER_VNN; - id->unique_id = SERVERID_UNIQUE_ID_NOT_TO_VERIFY; - - return; + *id = (struct server_id) { + .pid = UINT64_MAX, + .task_id = UINT32_MAX, + .vnn = NONCLUSTER_VNN, + .unique_id = SERVERID_UNIQUE_ID_NOT_TO_VERIFY, + }; } /**