[SVN] r485 - /trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch

[debian at incase.de]

Author: sven
Date: Thu Jun  8 14:33:54 2006
New Revision: 485

URL: https://mail.incase.de/viewcvs?rev=485&root=cyrus22&view=rev
Log:
Also fix union use in imap/squat_build.c

Modified:
    trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch?rev=485&root=cyrus22&r1=484&r2=485&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch Thu Jun  8 14:33:54 2006
@@ -5,9 +5,39 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c /tmp/dpep-work.Ax6L0q/cyrus-imapd-2.2.13/imap/tls.c
+diff -urNad --exclude=CVS --exclude=.svn ./imap/squat_build.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/squat_build.c
+--- ./imap/squat_build.c	2006-04-25 17:28:58.000000000 +0200
++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/squat_build.c	2006-06-08 14:33:06.966146056 +0200
+@@ -479,7 +479,7 @@
+     for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
+       SquatWordTableEntry* e = &(t->entries[i]);
+       
+-      if (e->leaf_presence != NULL && ((int)e->leaf_presence & 1) == 0) {
++      if (e->leaf_presence != NULL && ((int)e->leaf_presence_singleton & 1) == 0) {
+         free(e->leaf_presence);
+       }
+     }
+@@ -568,7 +568,7 @@
+ 
+   if (word_entry == NULL) {
+     /* We are in "per document" mode. */
+-    if (((int)e->leaf_presence & 1) != 0) {
++    if (((int)e->leaf_presence_singleton & 1) != 0) {
+       /* We currently have a singleton here. */
+       int oldch = e->leaf_presence_singleton >> 1;
+ 
+@@ -787,7 +787,7 @@
+ 
+       word[0] = (char)i;
+ 
+-      if (((int)e->leaf_presence & 1) != 0) {
++      if (((int)e->leaf_presence_singleton & 1) != 0) {
+ 	/* Got a singleton at this branch point. Just output the single word. */
+         word[1] = (char)(e->leaf_presence_singleton >> 1);
+         e->leaf_presence = NULL; /* clear the leaf out */
+diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/tls.c
 --- ./imap/tls.c	2006-04-25 17:28:58.000000000 +0200
-+++ /tmp/dpep-work.Ax6L0q/cyrus-imapd-2.2.13/imap/tls.c	2006-06-08 14:22:59.419636437 +0200
++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/tls.c	2006-06-08 14:28:13.259629963 +0200
 @@ -717,14 +717,22 @@
  	return (ret);
  
@@ -35,9 +65,9 @@
  	       argi, ret, (unsigned int) ret);
  	tls_dump(argp, (int) ret);
      }
-diff -urNad --exclude=CVS --exclude=.svn ./master/master.c /tmp/dpep-work.Ax6L0q/cyrus-imapd-2.2.13/master/master.c
+diff -urNad --exclude=CVS --exclude=.svn ./master/master.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/master/master.c
 --- ./master/master.c	2006-04-25 17:28:58.000000000 +0200
-+++ /tmp/dpep-work.Ax6L0q/cyrus-imapd-2.2.13/master/master.c	2006-06-08 13:48:16.176590361 +0200
++++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/master/master.c	2006-06-08 14:28:13.259629963 +0200
 @@ -1304,7 +1304,6 @@
  
  void add_service(const char *name, struct entry *e, void *rock)