Author: Rick Altherr <kc8apf@kc8apf.net>

	- printf conversion fixes for variably-sized types

git-svn-id: svn://svn.berlios.de/openocd/trunk@1882 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 8b3b1ac3cdc2c5cac7e8639fd39c77a346ea47ea..6da105b3c671fedf5d1bf0f2e562ba4ff6c6d8cd 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -189,9 +189,9 @@ int handle_pld_load_command(struct command_context_s *cmd_ctx, char *cmd, char *
                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;

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 2400ae39a5e67c95f071e6b0e1be09f6e9243e5c..a9317d3ed2211eefe21f2016c0e6eeafceb5b9d8 100644 (file)
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -1021,7 +1021,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
        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;
        }