Polish

bin/varnishd/mgt/mgt_child.c

@@ -462,8 +462,8 @@ mgt_reap_child(void)
 	if (ev_poker != NULL) {
 		VEV_Stop(mgt_evb, ev_poker);
 		free(ev_poker);
+		ev_poker = NULL;
 	}
-	ev_poker = NULL;
 
 	/* Stop the listener */
 	if (ev_listen != NULL) {

bin/varnishtest/vtc_http2.c

@@ -293,8 +293,7 @@ clean_frame(struct frame **f)
 	if ((*f)->type == TYPE_GOAWAY)
 		free((*f)->md.goaway.debug);
 	free((*f)->data);
-	free(*f);
-	*f = NULL;
+	FREE_OBJ(*f);
 }
 
 static void

bin/varnishtest/vtc_process.c

@@ -396,16 +396,16 @@ process_delete(struct process *p)
 	free(p->out);
 	free(p->err);
 
+	for (i = 0; i < p->nlin; i++)
+		free(p->vram[i]);
+	free(p->vram);
+
 	/*
 	 * We do not delete the directory, it may contain useful stdout
 	 * and stderr files. They will be deleted on account of belonging
 	 * to the test's tmpdir.
 	 */
 
-	for (i = 0; i < p->nlin; i++)
-		free(p->vram[i]);
-	free(p->vram);
-
 	/* XXX: MEMLEAK (?) */
 	FREE_OBJ(p);
 }