[Openocd-svn] r1882 - in trunk/src: pld xsvf

[kc8apf at B. <kc...@ma...>]

Author: kc8apf
Date: 2009-05-22 19:41:54 +0200 (Fri, 22 May 2009)
New Revision: 1882

Modified:
   trunk/src/pld/pld.c
   trunk/src/xsvf/xsvf.c
Log:
Author: Rick Altherr <kc...@kc...>
	- printf conversion fixes for variably-sized types


Modified: trunk/src/pld/pld.c
===================================================================
--- trunk/src/pld/pld.c	2009-05-22 02:32:31 UTC (rev 1881)
+++ trunk/src/pld/pld.c	2009-05-22 17:41:54 UTC (rev 1882)
@@ -189,9 +189,9 @@
 		gettimeofday(&end, NULL);	
 		timeval_subtract(&duration, &end, &start);
 
-		command_print(cmd_ctx, "loaded file %s to pld device %lu in %lis %lius",
+		command_print(cmd_ctx, "loaded file %s to pld device %lu in %jis %jius",
 			args[1], strtoul(args[0], NULL, 0),
-			duration.tv_sec, duration.tv_usec);
+			(intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec);
 	}
 	
 	return ERROR_OK;

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-05-22 02:32:31 UTC (rev 1881)
+++ trunk/src/xsvf/xsvf.c	2009-05-22 17:41:54 UTC (rev 1882)
@@ -1021,7 +1021,7 @@
 	if (unsupported)
 	{
 		command_print(cmd_ctx,
-			 "unsupported xsvf command: 0x%02X in xsvf file at offset %ld, aborting",
+			 "unsupported xsvf command: 0x%02X in xsvf file at offset %jd, aborting",
 					  uc,  lseek(xsvf_fd, 0, SEEK_CUR)-1 );
 		return ERROR_FAIL;
 	}