[master] 4cec396d7 Polish

[Dridi Boukelmoune]

commit 4cec396d78cd4b8e5361196e1c705410d14b09e7
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Jul 11 13:53:36 2019 +0200

    Polish

diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 8ded76669..2606ae274 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -603,11 +603,7 @@ xyzzy_concat__fini(struct xyzzy_debug_concat **concatp)
 	struct xyzzy_debug_concat *concat;
 	void *p;
 
-	if (concatp == NULL || *concatp == NULL)
-		return;
-	CHECK_OBJ(*concatp, CONCAT_MAGIC);
-	concat = *concatp;
-	*concatp = NULL;
+	TAKE_OBJ_NOTNULL(concat, concatp, CONCAT_MAGIC);
 	p = TRUST_ME(concat->s);
 	free(p);
 	FREE_OBJ(concat);