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 23058085ffad207bf02b9a9f55c5b1078156f152..69a76b1608f342b4d7a522d7657237fd3a2b34b4 100644 (file)
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2004 Daniel Silverstone and Project Purple
  *
  *
  * 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>
  */
 
 #include <sys/types.h>


@@ -279,7 +279,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
                        wl = wl->next;
                }
 
                        wl = wl->next;
                }
 

-               llfree(wordlist, NULL);
+               llfree(wordlist, free);

        }
 
        if (!intrans)
        }
 
        if (!intrans)

diff --git a/wordlist.c b/wordlist.c
index 173cc568c4333c68f81c4705744a92c3b3b12f1b..10b53a80285745f4d7111e64d2bbf957a097ef45 100644 (file)
--- a/wordlist.c
+++ b/wordlist.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2004 Project Purple
  *
  *
  * 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>
  */
 
 #include <ctype.h>


@@ -87,8 +87,8 @@ struct ll *makewordlistfromkey(struct ll *wordlist,
 
        uids = keyuids(key, NULL);
        for (i = 0; uids[i] != NULL; ++i) {
 
        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));
                        }
                        if (llfind(wordlist, wl->object, strcmp) == NULL) {
                                wordlist = lladd(wordlist, strdup(wl->object));
                        }