| 1 |
diff -Naurp cyrus-imapd-2.3.12p2/imap/saslserver.c cyrus-imapd-2.3.12p2.oden/imap/saslserver.c |
| 2 |
--- cyrus-imapd-2.3.12p2/imap/saslserver.c 2008-03-24 18:09:19.000000000 +0100 |
| 3 |
+++ cyrus-imapd-2.3.12p2.oden/imap/saslserver.c 2008-12-15 17:09:27.000000000 +0100 |
| 4 |
@@ -48,6 +48,7 @@ |
| 5 |
#include <sasl/sasl.h> |
| 6 |
#include <sasl/saslutil.h> |
| 7 |
|
| 8 |
+#include "xmalloc.h" /* xstrdup() */ |
| 9 |
#include "prot.h" |
| 10 |
#include "imap_err.h" |
| 11 |
#include "xmalloc.h" |
| 12 |
diff -Naurp cyrus-imapd-2.3.12p2/imap/squat_build.c cyrus-imapd-2.3.12p2.oden/imap/squat_build.c |
| 13 |
--- cyrus-imapd-2.3.12p2/imap/squat_build.c 2008-03-24 18:09:19.000000000 +0100 |
| 14 |
+++ cyrus-imapd-2.3.12p2.oden/imap/squat_build.c 2008-12-15 17:09:27.000000000 +0100 |
| 15 |
@@ -93,6 +93,7 @@ |
| 16 |
#include <config.h> |
| 17 |
|
| 18 |
#include <stdlib.h> |
| 19 |
+#include <stdint.h> |
| 20 |
#include <string.h> |
| 21 |
#include <unistd.h> |
| 22 |
#include <sys/mman.h> |
| 23 |
@@ -609,7 +610,7 @@ static void delete_doc_word_table(SquatW |
| 24 |
for (i = 0; i < VECTOR_SIZE(t->entries); i++) { |
| 25 |
SquatWordTableEntry* e = &(t->entries[i]); |
| 26 |
|
| 27 |
- if (e->leaf_presence != NULL && ((int)e->leaf_presence & 1) == 0) { |
| 28 |
+ if (e->leaf_presence != NULL && ((intptr_t)e->leaf_presence & 1) == 0) { |
| 29 |
free(e->leaf_presence); |
| 30 |
} |
| 31 |
} |
| 32 |
@@ -698,7 +699,7 @@ static int add_to_table(SquatIndex* inde |
| 33 |
|
| 34 |
if (word_entry == NULL) { |
| 35 |
/* We are in "per document" mode. */ |
| 36 |
- if (((int)e->leaf_presence & 1) != 0) { |
| 37 |
+ if (((intptr_t)e->leaf_presence & 1) != 0) { |
| 38 |
/* We currently have a singleton here. */ |
| 39 |
int oldch = e->leaf_presence_singleton >> 1; |
| 40 |
|
| 41 |
@@ -917,7 +918,7 @@ static int write_words(SquatIndex* index |
| 42 |
|
| 43 |
word[0] = (char)i; |
| 44 |
|
| 45 |
- if (((int)e->leaf_presence & 1) != 0) { |
| 46 |
+ if (((intptr_t)e->leaf_presence & 1) != 0) { |
| 47 |
/* Got a singleton at this branch point. Just output the single word. */ |
| 48 |
word[1] = (char)(e->leaf_presence_singleton >> 1); |
| 49 |
e->leaf_presence = NULL; /* clear the leaf out */ |
Parent Directory
| 
Revision Log