Remove an unused field from the set object's struct.

src/vmod_selector.c

@@ -86,7 +86,6 @@ struct vmod_selector_set {
 	char		*vcl_name;
 	struct bitmaps	*bitmaps;
 	unsigned	nmembers;
-	unsigned	nentries;
 	VCL_BOOL	case_sensitive;
 };
 
@@ -183,7 +182,27 @@ vmod_set__init(VRT_CTX, struct vmod_selector_set **setp, const char *vcl_name,
 	AZ(set->table);
 	AZ(set->members);
 	AZ(set->origo);
-	AZ(set->nentries);
+}
+
+static inline void
+set_added(struct vmod_selector_set *set, unsigned idx, enum bitmap_e bitmap)
+{
+	CHECK_OBJ_NOTNULL(set, VMOD_SELECTOR_SET_MAGIC);
+	CHECK_OBJ_NOTNULL(set->bitmaps, VMOD_SELECTOR_BITMAPS_MAGIC);
+	AN(set->bitmaps->bitmaps[bitmap]);
+
+	vbit_set(set->bitmaps->bitmaps[bitmap], idx);
+}
+
+static inline int
+is_added(const struct vmod_selector_set *set, unsigned idx,
+	 enum bitmap_e bitmap)
+{
+	CHECK_OBJ_NOTNULL(set, VMOD_SELECTOR_SET_MAGIC);
+	CHECK_OBJ_NOTNULL(set->bitmaps, VMOD_SELECTOR_BITMAPS_MAGIC);
+	AN(set->bitmaps->bitmaps[bitmap]);
+
+	return (vbit_test(set->bitmaps->bitmaps[bitmap], idx));
 }
 
 VCL_VOID
@@ -199,14 +218,17 @@ vmod_set__fini(struct vmod_selector_set **setp)
 	PT_Free(set->origo);
 	for (unsigned i = 0; i < set->nmembers; i++)
 		free(set->members[i]);
-	for (unsigned i = 0; i < set->nentries; i++) {
-		struct entry *entry = set->table[i];
-		CHECK_OBJ_NOTNULL(entry, VMOD_SELECTOR_ENTRY_MAGIC);
-		free(entry->string);
-		if (entry->re != NULL)
-			VRE_free(&entry->re);
-		FREE_OBJ(entry);
-	}
+	for (int i = 0; i < __MAX_BITMAP; i++)
+		for (unsigned j = 0; j < set->nmembers; j++)
+			if (is_added(set, j, i)) {
+				struct entry *entry = set->table[j];
+				CHECK_OBJ_NOTNULL(entry,
+						  VMOD_SELECTOR_ENTRY_MAGIC);
+				free(entry->string);
+				if (entry->re != NULL)
+					VRE_free(&entry->re);
+				FREE_OBJ(entry);
+			}
 	for (int i = 0; i < __MAX_BITMAP; i++)
 		vbit_destroy(set->bitmaps->bitmaps[i]);
 	FREE_OBJ(set->bitmaps);
@@ -217,27 +239,6 @@ vmod_set__fini(struct vmod_selector_set **setp)
 	FREE_OBJ(set);
 }
 
-static inline void
-set_added(struct vmod_selector_set *set, unsigned idx, enum bitmap_e bitmap)
-{
-	CHECK_OBJ_NOTNULL(set, VMOD_SELECTOR_SET_MAGIC);
-	CHECK_OBJ_NOTNULL(set->bitmaps, VMOD_SELECTOR_BITMAPS_MAGIC);
-	AN(set->bitmaps->bitmaps[bitmap]);
-
-	vbit_set(set->bitmaps->bitmaps[bitmap], idx);
-}
-
-static inline int
-is_added(const struct vmod_selector_set *set, unsigned idx,
-	 enum bitmap_e bitmap)
-{
-	CHECK_OBJ_NOTNULL(set, VMOD_SELECTOR_SET_MAGIC);
-	CHECK_OBJ_NOTNULL(set->bitmaps, VMOD_SELECTOR_BITMAPS_MAGIC);
-	AN(set->bitmaps->bitmaps[bitmap]);
-
-	return (vbit_test(set->bitmaps->bitmaps[bitmap], idx));
-}
-
 VCL_VOID
 vmod_set_add(VRT_CTX, struct vmod_selector_set *set, VCL_STRING member,
 	     VCL_STRING string, VCL_STRING regex, VCL_BACKEND backend)
@@ -308,7 +309,6 @@ vmod_set_add(VRT_CTX, struct vmod_selector_set *set, VCL_STRING member,
 	if (string == NULL && re == NULL && backend == NULL)
 		return;
 
-	set->nentries = n;
 	set->table = realloc(set->table, n * sizeof(struct entry *));
 	AN(set->table);
 	ALLOC_OBJ(entry, VMOD_SELECTOR_ENTRY_MAGIC);