Remove unnecessary NULL-checks in ns__client_setup()

All these pointers are guaranteed to be non-NULL.

Additionally, update a comment to remove obviously outdated
information about the function's requirements.

diff --git a/lib/ns/client.c b/lib/ns/client.c
index 283e6b000e983faf793685577b413f2f8eefa492..7bd91405cd6951581025c8e6dced06f4f67981c8 100644 (file)
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -2290,11 +2290,8 @@ ns__client_setup(ns_client_t *client, ns_clientmgr_t *mgr, bool new) {
        isc_result_t result;
 
        /*
-        * Caller must be holding the manager lock.
-        *
         * Note: creating a client does not add the client to the
-        * manager's client list or set the client's manager pointer.
-        * The caller is responsible for that.
+        * manager's client list, the caller is responsible for that.
         */
 
        if (new) {
@@ -2358,18 +2355,10 @@ ns__client_setup(ns_client_t *client, ns_clientmgr_t *mgr, bool new) {
        return (ISC_R_SUCCESS);
 
 cleanup:
-       if (client->sendbuf != NULL) {
-               isc_mem_put(client->manager->send_mctx, client->sendbuf,
-                           NS_CLIENT_SEND_BUFFER_SIZE);
-       }
-
-       if (client->message != NULL) {
-               dns_message_detach(&client->message);
-       }
-
-       if (client->manager != NULL) {
-               ns_clientmgr_detach(&client->manager);
-       }
+       isc_mem_put(client->manager->send_mctx, client->sendbuf,
+                   NS_CLIENT_SEND_BUFFER_SIZE);
+       dns_message_detach(&client->message);
+       ns_clientmgr_detach(&client->manager);
 
        return (result);
 }