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

[debian at incase.de]

Author: sven
Date: Thu Jun  8 13:44:55 2006
New Revision: 482

URL: https://mail.incase.de/viewcvs?rev=482&root=cyrus22&view=rev
Log:
A new try at fixing the pointer-to-int cast warnings

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=482&root=cyrus22&r1=481&r2=482&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 13:44:55 2006
@@ -5,10 +5,27 @@
 ## DP: No description.
 
 @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 @@
+diff -urNad --exclude=CVS --exclude=.svn ./master/master.c /tmp/dpep-work.YutZhj/cyrus-imapd-2.2.13/master/master.c
+--- ./master/master.c	2006-04-25 17:28:58.000000000 +0200
++++ /tmp/dpep-work.YutZhj/cyrus-imapd-2.2.13/master/master.c	2006-06-08 13:43:47.163733683 +0200
+@@ -1304,7 +1304,6 @@
+ 
+ void add_service(const char *name, struct entry *e, void *rock)
+ {
+-    int ignore_err = (int) rock;
+     char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
+     int prefork = masterconf_getint(e, "prefork", 0);
+     int babysit = masterconf_getswitch(e, "babysit", 0);
+@@ -1324,7 +1323,7 @@
+ 	snprintf(buf, sizeof(buf),
+ 		 "unable to find command or port for service '%s'", name);
+ 
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}
+@@ -1340,7 +1339,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)) &&
@@ -17,12 +34,29 @@
  	    break;
      }
  
-@@ -1476,7 +1476,7 @@
-     }
-     else {
- 	evt->periodic = 1;
--	evt->mark = now;
-+	(struct event (*evt)).mark = now;
-     }
-     evt->period = period;
+@@ -1349,7 +1348,7 @@
+ 	char buf[256];
+ 	snprintf(buf, sizeof(buf), "multiple entries for service '%s'", name);
  
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}
+@@ -1438,7 +1437,6 @@
+ 
+ void add_event(const char *name, struct entry *e, void *rock)
+ {
+-    int ignore_err = (int) rock;
+     char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
+     int period = 60 * masterconf_getint(e, "period", 0);
+     int at = masterconf_getint(e, "at", -1), hour, min;
+@@ -1450,7 +1448,7 @@
+ 	snprintf(buf, sizeof(buf),
+ 		 "unable to find command or port for event '%s'", name);
+ 
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}