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

[debian at incase.de]

Author: sven
Date: Thu Jun  8 14:23:32 2006
New Revision: 484

URL: https://mail.incase.de/viewcvs?rev=484&root=cyrus22&view=rev
Log:
Also fix logging formats in imap/tls.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=484&root=cyrus22&r1=483&r2=484&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:23:32 2006
@@ -5,9 +5,39 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./master/master.c /tmp/dpep-work.YutZhj/cyrus-imapd-2.2.13/master/master.c
+diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c /tmp/dpep-work.Ax6L0q/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
+@@ -717,14 +717,22 @@
+ 	return (ret);
+ 
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-	printf("read from %08X [%08lX] (%d bytes => %ld (0x%X))",
+-	       (unsigned int) bio, (long unsigned int) argp,
++#if __WORDSIZE == 64
++	printf("read from %016zX [%016zX] (%d bytes => %ld (0x%X))",
++#else
++	printf("read from %08zX [%08zX] (%d bytes => %ld (0x%X))",
++#endif
++	       (size_t) bio, (size_t) argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+ 	return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-	printf("write to %08X [%08lX] (%d bytes => %ld (0x%X))",
+-	       (unsigned int) bio, (long unsigned int)argp,
++#if __WORDSIZE == 64
++	printf("write to %016zX [%016zX] (%d bytes => %ld (0x%X))",
++#else
++	printf("write to %08zX [%08zX] (%d bytes => %ld (0x%X))",
++#endif
++	       (size_t) bio, (size_t)argp,
+ 	       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
 --- ./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
++++ /tmp/dpep-work.Ax6L0q/cyrus-imapd-2.2.13/master/master.c	2006-06-08 13:48:16.176590361 +0200
 @@ -1304,7 +1304,6 @@
  
  void add_service(const char *name, struct entry *e, void *rock)