From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jerone Young <jyoung5@us.ibm.com>
Subject: [PATCH][RESEND] Fix compilation issues in xend
Date: Tue, 11 Oct 2005 12:36:29 -0500
Message-ID: <1129052189.3208.6.camel@thinkpad>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-K3hsyLNYylXsLT5PHauL"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org


--=-K3hsyLNYylXsLT5PHauL
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Something must have happened copying & pasting the patch in the last
email I am submitting this one in a text file attached.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

-- 
Jerone Young
IBM Linux Technology Center
jyoung5@us.ibm.com
512-838-1157 (T/L: 678-1157)

--=-K3hsyLNYylXsLT5PHauL
Content-Disposition: attachment; filename=xenstore_compile_fix.diff
Content-Type: text/x-patch; name=xenstore_compile_fix.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

# HG changeset patch
# User root@localhost.localdomain
# Node ID 0eee5f59e216a7bec6fd4160db2d4ae9808c5a61
# Parent  4e335372ace84b605cebc36a42610caadb09a4d8
Fix compilation problems with xenstore.

diff -r 4e335372ace8 -r 0eee5f59e216 tools/xenstore/xs_tdb_dump.c
--- a/tools/xenstore/xs_tdb_dump.c	Tue Oct 11 14:23:19 2005
+++ b/tools/xenstore/xs_tdb_dump.c	Wed Oct 12 02:35:10 2005
@@ -53,17 +53,17 @@
 		hdr = (void *)data.dptr;
 		if (data.dsize < sizeof(*hdr))
 			fprintf(stderr, "%.*s: BAD truncated\n",
-				key.dsize, key.dptr);
+				(int)key.dsize, key.dptr);
 		else if (data.dsize != total_size(hdr))
 			fprintf(stderr, "%.*s: BAD length %i for %i/%i/%i (%i)\n",
-				key.dsize, key.dptr, data.dsize,
+				(int)key.dsize, key.dptr, (int)data.dsize,
 				hdr->num_perms, hdr->datalen,
 				hdr->childlen, total_size(hdr));
 		else {
 			unsigned int i;
 			char *p;
 
-			printf("%.*s: ", key.dsize, key.dptr);
+			printf("%.*s: ", (int)key.dsize, key.dptr);
 			for (i = 0; i < hdr->num_perms; i++)
 				printf("%s%c%i",
 				       i == 0 ? "" : ",",
diff -r 4e335372ace8 -r 0eee5f59e216 tools/xenstore/xsls.c
--- a/tools/xenstore/xsls.c	Tue Oct 11 14:23:19 2005
+++ b/tools/xenstore/xsls.c	Wed Oct 12 02:35:10 2005
@@ -8,7 +8,8 @@
 {
     char **e;
     char newpath[512], *val;
-    int num, i, len;
+    int i;
+    unsigned int num, len;
 
     e = xs_directory(h, NULL, path, &num);
     if (e == NULL)
@@ -25,7 +26,7 @@
         if (val == NULL)
             printf(":\n");
         else if ((unsigned)len > (151 - strlen(e[i])))
-            printf(" = \"%.*s...\"\n", 148 - strlen(e[i]), val);
+            printf(" = \"%.*s...\"\n", (int)(148 - strlen(e[i])), val);
         else
             printf(" = \"%s\"\n", val);
         free(val);

--=-K3hsyLNYylXsLT5PHauL
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--=-K3hsyLNYylXsLT5PHauL--