Merged.
--Subrata
On Fri, 2008-03-21 at 09:43 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[EMAIL PROTECTED]>
>
> Fix disktest printf format warnings (on Linux; no idea about Windows):
>
> childmain.c:443: warning: format '%d' expects type 'int', but argument 4 has
> type 'size_t'
> childmain.c:443: warning: format '%X' expects type 'unsigned int', but
> argument 5 has type 'size_t'
> childmain.c:445: warning: format '%d' expects type 'int', but argument 6 has
> type 'size_t'
> childmain.c:448: warning: format '%d' expects type 'int', but argument 6 has
> type 'size_t'
> childmain.c:451: warning: format '%d' expects type 'int', but argument 6 has
> type 'size_t'
>
> Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
> ---
> testcases/kernel/io/disktest/childmain.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- ltp-intermediate-21032008.orig/testcases/kernel/io/disktest/childmain.h
> +++ ltp-intermediate-21032008/testcases/kernel/io/disktest/childmain.h
> @@ -37,7 +37,7 @@ typedef enum mc_func {
> EXP,ACT,REREAD
> } mc_func_t;
>
> -#define DMOFFSTR "Thread %d: First miscompare at byte offset %d (0x%X)\n"
> +#define DMOFFSTR "Thread %d: First miscompare at byte offset %zd (0x%zX)\n"
>
> #ifdef WINDOWS
> #define DMSTR "Thread %d: Data miscompare at lba %I64d (0x%I64X)\n"
> @@ -49,7 +49,7 @@ DWORD WINAPI ChildMain(test_ll_t *);
> #define DMSTR "Thread %d: Data miscompare at lba %lld (0x%llX)\n"
> #define AFSTR "Thread %d: %s failed: seek %llu, lba %lld (0x%llX), got =
> %ld, asked for = %ld, errno %lu\n"
> #define SFSTR "Thread %d: seek failed seek %lld, lba = %lld, request pos =
> %lld, seek pos = %lld, errno %lu\n"
> -#define DMFILESTR "\n********** %s (Target: %s, LBA: %lld, Offset: %d)
> **********\n"
> +#define DMFILESTR "\n********** %s (Target: %s, LBA: %lld, Offset: %zd)
> **********\n"
> void *ChildMain(void *);
> #endif
>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
