From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 31 May 2004 23:48:28 +0000 (+0000)
Subject: cscvs to tla changeset 136
X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/71ad017abe933ba0dc7ed1b005074c4a5ab9978a?ds=sidebyside;hp=7832417cd58ad0abc5745fa4ac256c7442fd3f9a

cscvs to tla changeset 136
Author: noodles
Date: 2004/05/28 03:23:04
More wordlist cleanups.
---

diff --git a/keydb_fs.c b/keydb_fs.c
index 2305808..69a76b1 100644
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2004 Daniel Silverstone and Project Purple
  *
- * $Id: keydb_fs.c,v 1.2 2004/05/28 02:55:49 noodles Exp $
+ * $Id: keydb_fs.c,v 1.3 2004/05/28 03:23:04 noodles Exp $
  */
 
 #include <sys/types.h>
@@ -279,7 +279,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
 			wl = wl->next;
 		}
 
-		llfree(wordlist, NULL);
+		llfree(wordlist, free);
 	}
 
 	if (!intrans)
diff --git a/wordlist.c b/wordlist.c
index 173cc56..10b53a8 100644
--- a/wordlist.c
+++ b/wordlist.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2004 Project Purple
  *
- * $Id: wordlist.c,v 1.2 2004/05/28 02:55:49 noodles Exp $
+ * $Id: wordlist.c,v 1.3 2004/05/28 03:23:04 noodles Exp $
  */
 
 #include <ctype.h>
@@ -87,8 +87,8 @@ struct ll *makewordlistfromkey(struct ll *wordlist,
 
 	uids = keyuids(key, NULL);
 	for (i = 0; uids[i] != NULL; ++i) {
-		words = makewordlist(wordlist, uids[i]);
-		for (wl = words; wl->next; wl = wl->next) {
+		words = makewordlist(NULL, uids[i]);
+		for (wl = words; wl != NULL; wl = wl->next) {
 			if (llfind(wordlist, wl->object, strcmp) == NULL) {
 				wordlist = lladd(wordlist, strdup(wl->object));
 			}