summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-11-21 16:03:36 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-11-21 16:03:36 +0000
commit1ef2b73b79127c5a4d74e0ec3f144eebb3652700 (patch)
tree44c095e534bb1c6a8e330a3b0921a644c02b162a
parent6f0bc5c17885f4efd88920a7f9c705a9c1534918 (diff)
downloadrockbox-1ef2b73b79127c5a4d74e0ec3f144eebb3652700.tar.gz
rockbox-1ef2b73b79127c5a4d74e0ec3f144eebb3652700.zip
nuked gcc4 warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8025 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--tools/sh2d.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/sh2d.c b/tools/sh2d.c
index 5e2241d959..aee69d324e 100644
--- a/tools/sh2d.c
+++ b/tools/sh2d.c
@@ -30,7 +30,7 @@
30typedef struct 30typedef struct
31{ 31{
32 int format; 32 int format;
33 unsigned char *mnem; 33 const char *mnem;
34 unsigned short mask; /* mask used to obtain opcode bits */ 34 unsigned short mask; /* mask used to obtain opcode bits */
35 unsigned short bits; /* opcode bits */ 35 unsigned short bits; /* opcode bits */
36 int dat; /* specific data for situation */ 36 int dat; /* specific data for situation */
@@ -541,7 +541,7 @@ int main(int argc, char **argv)
541 fseek(fp, 0, SEEK_END); 541 fseek(fp, 0, SEEK_END);
542 fsize = ftell(fp); 542 fsize = ftell(fp);
543 rewind(fp); 543 rewind(fp);
544 if ((buffer = (unsigned char *) calloc(fsize * 2, sizeof(unsigned short))) 544 if ((buffer = (char *) calloc(fsize * 2, sizeof(unsigned short)))
545 == NULL) 545 == NULL)
546 { 546 {
547 fprintf(stderr, "sh2d: Not enough memory to load input " 547 fprintf(stderr, "sh2d: Not enough memory to load input "
@@ -560,11 +560,11 @@ int main(int argc, char **argv)
560 { 560 {
561 if (do_org) 561 if (do_org)
562 { 562 {
563 SH2Disasm(org, &buffer[i], mode, &mark[i]); 563 SH2Disasm(org, (unsigned char*)&buffer[i], mode, &mark[i]);
564 org += 2; 564 org += 2;
565 } 565 }
566 else 566 else
567 SH2Disasm(i, &buffer[i], mode, &mark[i]); 567 SH2Disasm(i, (unsigned char *)&buffer[i], mode, &mark[i]);
568 j += 2; 568 j += 2;
569 } 569 }
570 570