From 8c0a903ccb9fe6295eecb14b5c90ccc3806d2712 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 10 Dec 2007 14:39:19 +0000 Subject: Fix printf format string length modifiers, removes about a trillion warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25341 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/realcodecs/sipr.c | 90 ++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'TOOLS/realcodecs/sipr.c') diff --git a/TOOLS/realcodecs/sipr.c b/TOOLS/realcodecs/sipr.c index 22d69d708a..386fdfb23b 100644 --- a/TOOLS/realcodecs/sipr.c +++ b/TOOLS/realcodecs/sipr.c @@ -183,7 +183,7 @@ void toc() { usecs+=1000000; --secs; } - fprintf(stderr, "Duration: %d.%0.6ds\n", secs, usecs); + fprintf(stderr, "Duration: %ld.%0.6lds\n", secs, usecs); } @@ -220,10 +220,10 @@ void hexdump(void *pos, int len) { ulong RACloseCodec(ulong p1) { ulong result; - fprintf(stderr, "RACloseCodec(ulong p1=0x%0x(%d))\n", p1, p1); + fprintf(stderr, "RACloseCodec(ulong p1=0x%0lx(%ld))\n", p1, p1); result=(*raCloseCodec)(p1); // closeDll(); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } @@ -233,12 +233,12 @@ ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { ulong result; int x,y; - fprintf(stderr, "RADecode(ulong ctx=0x%0x, ", p1); - fprintf(stderr, "ulong src=0x%0x,\n", p2); - fprintf(stderr, "ulong len=0x%0x,", p3); - fprintf(stderr, "ulong dst=0x%0x,\n", p4); + fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1); + fprintf(stderr, "ulong src=0x%0lx,\n", p2); + fprintf(stderr, "ulong len=0x%0lx,", p3); + fprintf(stderr, "ulong dst=0x%0lx,\n", p4); fprintf(stderr, "ulong dstcnt=0x%0x, ",p5); - fprintf(stderr, "ulong p6=%d)\n", p6); + fprintf(stderr, "ulong p6=%ld)\n", p6); // hexdump((void*)p1, 44); // hexdump((void*)p2, p3); // hexdump((void*)p4, 80); @@ -275,62 +275,62 @@ ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) { // hexdump((void*)p1, 44); // hexdump((void*)p4, 80); // hexdump((void*)p5, 16); - fprintf(stderr, "--> 0x%0x(%d) decoded: %d \n\n\n", result, result, p5[0]); + fprintf(stderr, "--> 0x%0lx(%ld) decoded: %ld \n\n\n", result, result, p5[0]); return result; } ulong RAEncode(ulong p1,ulong p2,ulong p3) { ulong result; - fprintf(stderr, "RAEncode(ulong p1=0x%0x(%d), ", p1, p1); - fprintf(stderr, "ulong p2=0x%0x(%d),\n", p2, p2); - fprintf(stderr, "ulong p3=0x%0x(%d))\n", p3, p3); + fprintf(stderr, "RAEncode(ulong p1=0x%0lx(%ld), ", p1, p1); + fprintf(stderr, "ulong p2=0x%0lx(%ld),\n", p2, p2); + fprintf(stderr, "ulong p3=0x%0lx(%ld))\n", p3, p3); result=(*raEncode)(p1,p2,p3); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } ulong RAFlush(ulong p1,ulong p2,ulong p3) { ulong result; - fprintf(stderr, "RAFlush(ulong p1=0x%0x(%d), ", p1, p1); - fprintf(stderr, "ulong p2=0x%0x(%d),\n", p2, p2); - fprintf(stderr, "ulong p3=0x%0x(%d))\n", p3, p3); + fprintf(stderr, "RAFlush(ulong p1=0x%0lx(%ld), ", p1, p1); + fprintf(stderr, "ulong p2=0x%0lx(%ld),\n", p2, p2); + fprintf(stderr, "ulong p3=0x%0lx(%ld))\n", p3, p3); result=(*raFlush)(p1,p2,p3); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } ulong RAFreeDecoder(ulong p1) { ulong result; - fprintf(stderr, "RAFreeDecoder(ulong p1=0x%0x(%d))\n", p1, p1); + fprintf(stderr, "RAFreeDecoder(ulong p1=0x%0lx(%ld))\n", p1, p1); hexdump((void*)p1, 44); result=(*raFreeDecoder)(p1); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } ulong RAFreeEncoder(ulong p1) { ulong result; - fprintf(stderr, "RAFreeEncoder(ulong p1=0x%0x(%d))\n", p1, p1); + fprintf(stderr, "RAFreeEncoder(ulong p1=0x%0lx(%ld))\n", p1, p1); result=(*raFreeEncoder)(p1); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } ulong RAGetFlavorProperty(ulong p1,ulong p2,ulong p3, ulong p4) { ulong result; - fprintf(stderr, "RAGetFlavorProperty(ulong p1=0x%0x(%d), ", p1, p1); - fprintf(stderr, "ulong p2=0x%0x(%d),\n", p2, p2); - fprintf(stderr, "ulong p3=0x%0x(%d), ", p3, p3); - fprintf(stderr, "ulong p4=0x%0x(%d))\n", p4, p4); + fprintf(stderr, "RAGetFlavorProperty(ulong p1=0x%0lx(%ld), ", p1, p1); + fprintf(stderr, "ulong p2=0x%0lx(%ld),\n", p2, p2); + fprintf(stderr, "ulong p3=0x%0lx(%ld), ", p3, p3); + fprintf(stderr, "ulong p4=0x%0lx(%ld))\n", p4, p4); hexdump((void*)p4/*(void*)(*((void**)p4))*/,p2); hexdump((void*)p1, 44); tic(); result=(*raGetFlavorProperty)(p1,p2,p3,p4); toc(); - fprintf(stderr, "*p4=0x%0x\n", *((ulong*)p4)); + fprintf(stderr, "*p4=0x%0lx\n", *((ulong*)p4)); hexdump((void*)p4/*(void*)(*((void**)p4))*/,p2); hexdump((void*)p1, 44); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } @@ -338,7 +338,7 @@ ulong RAGetNumberOfFlavors(void) { ulong result; fprintf(stderr, "RAGetNumberOfFlavors(void)\n"); result=(*raGetNumberOfFlavors)(); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } @@ -346,8 +346,8 @@ ulong RAInitDecoder(ulong p1,ulong p2) { ulong result; // int temp[256]; // unsigned char temp2[256]; - fprintf(stderr, "RAInitDecoder(ulong p1=0x%0x(%d), ", p1, p1); - fprintf(stderr, "ulong p2=0x%0x(%d))\n", p2, p2); + fprintf(stderr, "RAInitDecoder(ulong p1=0x%0lx(%ld), ", p1, p1); + fprintf(stderr, "ulong p2=0x%0lx(%ld))\n", p2, p2); hexdump((void*)p2, 4*7); // hexdump((void*)p1, 44); @@ -368,36 +368,36 @@ ulong RAInitDecoder(ulong p1,ulong p2) { // memcpy(p2,temp,4*11); // hexdump((void*)p1, 44); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } ulong RAInitEncoder(ulong p1,ulong p2) { ulong result; - fprintf(stderr, "RAInitEncoder(ulong p1=0x%0x(%d), ", p1, p1); - fprintf(stderr, "ulong p2=0x%0x(%d))\n", p2, p2); + fprintf(stderr, "RAInitEncoder(ulong p1=0x%0lx(%ld), ", p1, p1); + fprintf(stderr, "ulong p2=0x%0lx(%ld))\n", p2, p2); result=(*raInitEncoder)(p1,p2); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } ulong RAOpenCodec(ulong p1) { ulong result; // loadSyms(); - fprintf(stderr, "RAOpenCodec(ulong p1=0x%0x(%d))\n", p1, p1); + fprintf(stderr, "RAOpenCodec(ulong p1=0x%0lx(%ld))\n", p1, p1); result=(*raOpenCodec)(p1); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } ulong RAOpenCodec2(ulong p1) { ulong result; // loadSyms(); - fprintf(stderr, "RAOpenCodec2(ulong p1=0x%0x(%d))\n", p1, p1); + fprintf(stderr, "RAOpenCodec2(ulong p1=0x%0lx(%ld))\n", p1, p1); hexdump((void*)p1, 44); result=(*raOpenCodec2)(p1); hexdump((void*)p1, 44); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); return result; } @@ -405,23 +405,23 @@ ulong RASetFlavor(ulong p1,ulong p2,ulong p3) { ulong result, numprop=0, result1=0; ulong numflavors, flavor; unsigned short property; - fprintf(stderr, "RASetFlavor(ulong p1=0x%0x(%d), ", p1, p1); - fprintf(stderr, "ulong p2=0x%0x(%d))\n", p2, p2); + fprintf(stderr, "RASetFlavor(ulong p1=0x%0lx(%ld), ", p1, p1); + fprintf(stderr, "ulong p2=0x%0lx(%ld))\n", p2, p2); // hexdump((void*)p1, 44); // hexdump((void*)p1, 44); result=(*raSetFlavor)(p1,p2,p3); - fprintf(stderr, "--> 0x%0x(%d)\n\n\n", result, result); + fprintf(stderr, "--> 0x%0lx(%ld)\n\n\n", result, result); #if 1 fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr); numflavors=3;//raGetNumberOfFlavors(); flavor=0; while (flavor