cscvs to tla changeset 137

[onak.git] / keydb_db3.c

diff --git a/keydb_db3.c b/keydb_db3.c
index 247cbabf3e89f88250be67f9de74da254f6e0efb..464dcc9d445f792022c9a32efee30f1be33d20b7 100644 (file)
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: keydb_db3.c,v 1.24 2004/03/28 21:27:03 noodles Exp $
+ * $Id: keydb_db3.c,v 1.26 2004/05/27 03:33:24 noodles Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>


@@ -30,6 +30,7 @@
 #include "log.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "log.h"
 #include "onak-conf.h"
 #include "parsekey.h"

+#include "wordlist.h"

 
 /**
  *     dbenv - our database environment.
 
 /**
  *     dbenv - our database environment.


@@ -65,56 +66,6 @@ DB *keydb(uint64_t keyid)
        return(dbconns[keytrun % numdbs]);
 }
 
        return(dbconns[keytrun % numdbs]);
 }
 

-/**
- *     makewordlist - Takes a string and splits it into a set of unique words.
- *     @wordlist: The current word list.
- *     @words: The string to split and add.
- *
- *     We take words and split it on non alpha numeric characters. These get
- *     added to the word list if they're not already present. If the wordlist
- *     is NULL then we start a new list, otherwise it's search for already
- *     added words. Note that words is modified in the process of scanning.
- *
- *     Returns the new word list.
- */
-struct ll *makewordlist(struct ll *wordlist, char *word)
-{
-       char *start = NULL;
-       char *end = NULL;
-
-       /*
-        * Walk through the words string, spliting on non alphanumerics and
-        * then checking if the word already exists in the list. If not then
-        * we add it.
-        */
-       end = word;
-       while (end != NULL && *end != 0) {
-               start = end;
-               while (*start != 0 && !isalnum(*start)) {
-                       start++;
-               }
-               end = start;
-               while (*end != 0 && isalnum(*end)) {
-                       *end = tolower(*end);
-                       end++;
-               }
-               if (end - start > 1) {
-                       if (*end != 0) {
-                               *end = 0;
-                               end++;
-                       }
-                       
-                       if (llfind(wordlist, start,
-                                       strcmp) == NULL) {
-                               wordlist = lladd(wordlist,
-                                               start);
-                       }
-               }
-       }
-
-       return wordlist;
-}
-

 /**
  *     initdb - Initialize the key database.
  *
 /**
  *     initdb - Initialize the key database.
  *


@@ -201,7 +152,7 @@ void initdb(bool readonly)
                snprintf(buf, 1023, "keydb.%d.db", i);
                flags = DB_CREATE;
                if (readonly) {
                snprintf(buf, 1023, "keydb.%d.db", i);
                flags = DB_CREATE;
                if (readonly) {

-                       flags |= DB_RDONLY;
+                       flags = DB_RDONLY;

                }
                ret = dbconns[i]->open(dbconns[i], buf,
                        NULL,
                }
                ret = dbconns[i]->open(dbconns[i], buf,
                        NULL,