Merge branch 'mh/packed-ref-store-prep' into maint

diff --git a/commit-slab.h b/commit-slab.h
index 42d16dcded870bfa400421a88b6d0d8c9309a404..333d81e370b188aae2110860df9eaff7b9d9582f 100644 (file)
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -82,8 +82,7 @@ static MAYBE_UNUSED void clear_ ##slabname(struct slabname *s)                \
        for (i = 0; i < s->slab_count; i++)                             \
                free(s->slab[i]);                                       \
        s->slab_count = 0;                                              \
-       free(s->slab);                                                  \
-       s->slab = NULL;                                                 \
+       FREE_AND_NULL(s->slab);                                         \
 }                                                                      \
                                                                        \
 static MAYBE_UNUSED elemtype *slabname## _at_peek(struct slabname *s,  \