rpms/nc/devel nc-gcc_signess.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: rvokal

Update of /cvs/dist/rpms/nc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3146

Modified Files:
	nc-gcc_signess.patch 
Log Message:
 x86_64 fixies

nc-gcc_signess.patch:
 socks.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

Index: nc-gcc_signess.patch
===================================================================
RCS file: /cvs/dist/rpms/nc/devel/nc-gcc_signess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nc-gcc_signess.patch	25 Jan 2006 10:11:59 -0000	1.1
+++ nc-gcc_signess.patch	25 Jan 2006 10:22:35 -0000	1.2
@@ -1,6 +1,48 @@
 --- nc/socks.c.gcc	2005-11-18 11:24:04.000000000 +0100
-+++ nc/socks.c	2006-01-25 11:04:12.000000000 +0100
-@@ -238,17 +238,17 @@
++++ nc/socks.c	2006-01-25 11:21:44.000000000 +0100
+@@ -147,11 +147,11 @@
+ 		buf[2] = SOCKS_NOAUTH;
+ 		cnt = atomicio(vwrite, proxyfd, buf, 3);
+ 		if (cnt != 3)
+-			err(1, "write failed (%d/3)", cnt);
++			err(1, "write failed (%d/3)", (int)cnt);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 2);
+ 		if (cnt != 2)
+-			err(1, "read failed (%d/3)", cnt);
++			err(1, "read failed (%d/3)", (int)cnt);
+ 
+ 		if (buf[1] == SOCKS_NOMETHOD)
+ 			errx(1, "authentication method negotiation failed");
+@@ -200,11 +200,11 @@
+ 
+ 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
+ 		if (cnt != wlen)
+-			err(1, "write failed (%d/%d)", cnt, wlen);
++			err(1, "write failed (%d/%d)", (int)cnt, (int)wlen);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 10);
+ 		if (cnt != 10)
+-			err(1, "read failed (%d/10)", cnt);
++			err(1, "read failed (%d/10)", (int)cnt);
+ 		if (buf[1] != 0)
+ 			errx(1, "connection failed, SOCKS error %d", buf[1]);
+ 	} else if (socksv == 4) {
+@@ -222,11 +222,11 @@
+ 
+ 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
+ 		if (cnt != wlen)
+-			err(1, "write failed (%d/%d)", cnt, wlen);
++			err(1, "write failed (%d/%d)", (int)cnt, (int)wlen);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 8);
+ 		if (cnt != 8)
+-			err(1, "read failed (%d/8)", cnt);
++			err(1, "read failed (%d/8)", (int)cnt);
+ 		if (buf[1] != 90)
+ 			errx(1, "connection failed, SOCKS error %d", buf[1]);
+ 	} else if (socksv == -1) {
+@@ -238,26 +238,26 @@
  
  		/* Try to be sane about numeric IPv6 addresses */
  		if (strchr(host, ':') != NULL) {
@@ -21,7 +63,8 @@
  
  		cnt = atomicio(vwrite, proxyfd, buf, r);
  		if (cnt != r)
-@@ -256,8 +256,8 @@
+-			err(1, "write failed (%d/%d)", cnt, r);
++			err(1, "write failed (%d/%d)", (int)cnt, (int)r);
  
  		/* Read reply */
  		for (r = 0; r < HTTP_MAXHDRS; r++) {