projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix db4 backend - we weren't actually providing a suitable dbfuncs struct.
[onak.git]
/
wordlist.c
diff --git
a/wordlist.c
b/wordlist.c
index 10b53a80285745f4d7111e64d2bbf957a097ef45..791c55d96e6fb10274c9084b12d7ed8541280b33 100644
(file)
--- a/
wordlist.c
+++ b/
wordlist.c
@@
-4,8
+4,6
@@
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2004 Project Purple
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2004 Project Purple
- *
- * $Id: wordlist.c,v 1.3 2004/05/28 03:23:04 noodles Exp $
*/
#include <ctype.h>
*/
#include <ctype.h>
@@
-42,11
+40,11
@@
struct ll *makewordlist(struct ll *wordlist, char *word)
end = word;
while (end != NULL && *end != 0) {
start = end;
end = word;
while (end != NULL && *end != 0) {
start = end;
- while (*start != 0 &&
!isalnum(*start
)) {
+ while (*start != 0 &&
(ispunct(*start) || isspace (*start)
)) {
start++;
}
end = start;
start++;
}
end = start;
- while (*end != 0 &&
isalnum(*end
)) {
+ while (*end != 0 &&
(!ispunct(*end) && !isspace (*end)
)) {
*end = tolower(*end);
end++;
}
*end = tolower(*end);
end++;
}
@@
-56,8
+54,10
@@
struct ll *makewordlist(struct ll *wordlist, char *word)
end++;
}
end++;
}
- if (llfind(wordlist, start, strcmp) == NULL) {
- wordlist = lladd(wordlist, start);
+ if (llfind(wordlist, start,
+ (int (*)(const void *, const void *)) strcmp
+ ) == NULL) {
+ wordlist = lladdend(wordlist, start);
}
}
}
}
}
}
@@
-89,7
+89,9
@@
struct ll *makewordlistfromkey(struct ll *wordlist,
for (i = 0; uids[i] != NULL; ++i) {
words = makewordlist(NULL, uids[i]);
for (wl = words; wl != NULL; wl = wl->next) {
for (i = 0; uids[i] != NULL; ++i) {
words = makewordlist(NULL, uids[i]);
for (wl = words; wl != NULL; wl = wl->next) {
- if (llfind(wordlist, wl->object, strcmp) == NULL) {
+ if (llfind(wordlist, wl->object,
+ (int (*)(const void *, const void *)) strcmp
+ ) == NULL) {
wordlist = lladd(wordlist, strdup(wl->object));
}
}
wordlist = lladd(wordlist, strdup(wl->object));
}
}