svn commit: r198051 - projects/capabilities8/usr.bin/gzip

[Robert Watson]

Author: rwatson
Date: Tue Oct 13 20:32:50 2009
New Revision: 198051
URL: http://svn.freebsd.org/changeset/base/198051

Log:
  Merge Perforce c169466 into the capabilities8 branch:
  
    printf() size_t's using %zu to please 64-bit builds.

Modified:
  projects/capabilities8/usr.bin/gzip/gzsandbox.c

Modified: projects/capabilities8/usr.bin/gzip/gzsandbox.c
==============================================================================
--- projects/capabilities8/usr.bin/gzip/gzsandbox.c	Tue Oct 13 20:29:14 2009	(r198050)
+++ projects/capabilities8/usr.bin/gzip/gzsandbox.c	Tue Oct 13 20:32:50 2009	(r198051)
@@ -145,7 +145,7 @@ gz_compress_insandbox(int in, int out, o
 	    fdarray, 2, &iov_rep, 1, &len, NULL, NULL) < 0)
 		err(-1, "lch_rpc_rights");
 	if (len != sizeof(rep))
-		errx(-1, "lch_rpc_rights len %d", len);
+		errx(-1, "lch_rpc_rights len %zu", len);
 	if (gsizep != NULL)
 		*gsizep = rep.hgc_rep_gsize;
 	close(fdarray[0]);
@@ -162,7 +162,7 @@ sandbox_gz_compress_buffer(struct lc_hos
 	struct iovec iov;
 
 	if (len != sizeof(req))
-		err(-1, "sandbox_gz_compress_buffer: len %d", len);
+		err(-1, "sandbox_gz_compress_buffer: len %zu", len);
 
 	bcopy(buffer, &req, sizeof(req));
 	bzero(&rep, sizeof(rep));
@@ -226,7 +226,7 @@ gz_uncompress_insandbox(int in, int out,
 	    fdarray, 2, &iov_rep, 1, &len, NULL, NULL) < 0)
 		err(-1, "lch_rpc_rights");
 	if (len != sizeof(rep))
-		errx(-1, "lch_rpc_rights len %d", len);
+		errx(-1, "lch_rpc_rights len %zu", len);
 	if (gsizep != NULL)
 		*gsizep = rep.hgu_rep_gsize;
 	close(fdarray[0]);
@@ -244,7 +244,7 @@ sandbox_gz_uncompress_buffer(struct lc_h
 	char *pre;
 
 	if (len != sizeof(req))
-		err(-1, "sandbox_gz_uncompress_buffer: len %d", len);
+		err(-1, "sandbox_gz_uncompress_buffer: len %zu", len);
 
 	bcopy(buffer, &req, sizeof(req));
 	pre = buffer + sizeof(req);
@@ -306,7 +306,7 @@ unbzip2_insandbox(int in, int out, char 
 	    fdarray, 2, &iov_rep, 1, &len, NULL, NULL) < 0)
 		err(-1, "lch_rpc_rights");
 	if (len != sizeof(rep))
-		errx(-1, "lch_rpc_rights len %d", len);
+		errx(-1, "lch_rpc_rights len %zu", len);
 	if (bytes_in != NULL)
 		*bytes_in = rep.hub_rep_bytes_in;
 	close(fdarray[0]);
@@ -324,7 +324,7 @@ sandbox_unbzip2_buffer(struct lc_host *l
 	char *pre;
 
 	if (len != sizeof(req))
-		err(-1, "sandbox_gz_uncompress_buffer: len %d", len);
+		err(-1, "sandbox_gz_uncompress_buffer: len %zu", len);
 
 	bcopy(buffer, &req, sizeof(req));
 	pre = buffer + sizeof(req);