jdict

Commit: 3e52af9ca73c7ac7954c212299ad95c9a1e5c2b4
Parent: cb973b87672540e0448b66c5ee4bf7443f1e81f5
Author: Randy Palamar
Date:   Sun, 19 Jun 2022 20:51:32 -0600

move outer loop in find_and_print_defs() to main()

this will make it easier to add a thread per dictionary if that is desired

Diffstat:
M
jdict.c
 | 
54
++++++++++++++++++++++++++----------------------------

1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/jdict.c b/jdict.c
@@ -205,39 +205,36 @@ print_ent(DictEnt *ent)
 }
 
 static int
-find_and_print_defs(char **terms, size_t nterms, struct Dict *dicts, size_t ndicts)
+find_and_print_defs(struct Dict *dict, char **terms, size_t nterms)
 {
 	char path[PATH_MAX - 18];
-	size_t i, j, k;
-	size_t nents;
+	size_t i, j;
+	size_t nents = 0;
 	DictEnt *ent, *ents;
 
-	for (i = 0; i < ndicts; i++) {
-		snprintf(path, LEN(path), "%s/%s", prefix, dicts[i].rom);
-		nents = 0;
-		ents = make_dict(path, dicts[i].stride, &nents);
-		if (ents == NULL)
-			return -1;
-		qsort(ents, nents, sizeof(DictEnt), entcmp);
-
-		printf("%s\n", dicts[i].name);
-		for (j = 0; j < nterms; j++) {
-			ent = find_ent(terms[j], ents, nents);
-			if (ent == NULL) {
-				printf("term not found: %s\n\n", terms[j]);
-				continue;
-			}
-			print_ent(ent);
-		}
-
-		for (j = 0; j < nents; j++) {
-			for (k = 0; k < ents[j].ndefs; k++)
-				free(ents[j].defs[k]);
-			free(ents[j].defs);
-			free(ents[j].term);
+	snprintf(path, LEN(path), "%s/%s", prefix, dict->rom);
+	ents = make_dict(path, dict->stride, &nents);
+	if (ents == NULL)
+		return -1;
+	qsort(ents, nents, sizeof(DictEnt), entcmp);
+		printf("%s\n", dict->name);
+
+	for (i = 0; i < nterms; i++) {
+		ent = find_ent(terms[i], ents, nents);
+		if (ent == NULL) {
+			printf("term not found: %s\n\n", terms[i]);
+			continue;
 		}
-		free(ents);
+		print_ent(ent);
 	}
+	for (i = 0; i < nents; i++) {
+		for (j = 0; j < ents[i].ndefs; j++)
+			free(ents[i].defs[j]);
+		free(ents[i].defs);
+		free(ents[i].term);
+	}
+	free(ents);
+
 	return 0;
 }
 
@@ -284,7 +281,8 @@ main(int argc, char *argv[])
 		usage();
 	}
 
-	find_and_print_defs(terms, nterms, dicts, ndicts);
+	for (i = 0; i < ndicts; i++)
+		find_and_print_defs(&dicts[i], terms, nterms);
 
 	cleanup(terms);