[SVN] r481 - in /trunk/cyrus-imapd-2.2.13/debian/patches: 0090-fix-casts.dpatch 00list

[debian at incase.de]

Author: sven
Date: Thu Jun  8 13:02:59 2006
New Revision: 481

URL: https://mail.incase.de/viewcvs?rev=481&root=cyrus22&view=rev
Log:
Try to fix the first two warnings about casts from pointer to integer of different size

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Added: 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=481&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch Thu Jun  8 13:02:59 2006
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fileJLxGHO.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/master/master.c /tmp/dpep.eaCbcB/cyrus-imapd-2.2.13/master/master.c
+--- cyrus-imapd-2.2.13/master/master.c	2006-03-31 20:18:13.000000000 +0200
++++ /tmp/dpep.eaCbcB/cyrus-imapd-2.2.13/master/master.c	2006-06-08 13:01:56.324972026 +0200
+@@ -1340,7 +1340,7 @@
+ 	/* must have empty/same service name, listen and proto */
+ 	if ((!Services[i].name || !strcmp(Services[i].name, name)) &&
+ 	    (!Services[i].listen || !strcmp(Services[i].listen, listen)) &&
+-	    (!Services[i].proto || !strcmp(Services[i].proto, proto)))
++	    ((Services[i].proto==NULL) || !strcmp(Services[i].proto, proto)))
+ 	    break;
+     }
+ 
+@@ -1476,7 +1476,7 @@
+     }
+     else {
+ 	evt->periodic = 1;
+-	evt->mark = now;
++	(struct event (*evt)).mark = now;
+     }
+     evt->period = period;
+ 

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=481&root=cyrus22&r1=480&r2=481&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Thu Jun  8 13:02:59 2006
@@ -13,6 +13,7 @@
 0013-upstream-allow-report-above-4GB-mboxsize.dpatch
 0014-upstream-fix-locks-during-reconstruction.dpatch
 0015-upstream-fix-logic-error-in-imapoptions.dpatch
+0090-fix-casts.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch