author | ecalot
<ecalot> 2004-07-31 04:59:16 UTC |
committer | ecalot
<ecalot> 2004-07-31 04:59:16 UTC |
parent | 2cfaf88a1c89e98e726928fb94c2c9186adaa245 |
PR/src/include/disk.h | +2 | -2 |
PR/src/lib/layers/disk.c | +5 | -5 |
diff --git a/PR/src/include/disk.h b/PR/src/include/disk.h index fe28b08..60f15aa 100644 --- a/PR/src/include/disk.h +++ b/PR/src/include/disk.h @@ -87,8 +87,8 @@ int mCopy(const char* strSource, const char* strTarget); #define fwritechar(var,file) fwrite((var),1,1,file) int macfreads (void* bigEndian,FILE* file); int macfreadl (void* var,FILE* file); -int macfwrites(void* var,FILE* file); -int macfwritel(void* var,FILE* file); +int macfwrites(const void* var,FILE* file); +int macfwritel(const void* var,FILE* file); #else #define freadshort(var,file) fread ((var),2,1,file) #define freadlong(var,file) fread ((var),4,1,file) diff --git a/PR/src/lib/layers/disk.c b/PR/src/lib/layers/disk.c index faf6ae5..53656d3 100644 --- a/PR/src/lib/layers/disk.c +++ b/PR/src/lib/layers/disk.c @@ -503,7 +503,7 @@ int macfreads (void* bigEndian,FILE* file) { big_e[1]=lit_e[0]; return result; } -int macfreadl (void* var,FILE* file) { +int macfreadl (void* bigEndian,FILE* file) { unsigned short int littleEndian; unsigned char* lit_e=(unsigned char*)&littleEndian; unsigned char* big_e=(unsigned char*)&bigEndian; @@ -514,9 +514,9 @@ int macfreadl (void* var,FILE* file) { big_e[3]=lit_e[0]; return result; } -int macfwrites(void* var,FILE* file) { +int macfwrites(const void* var,FILE* file) { unsigned short int littleEndian; - unsigned short int bigEndian=(unsigned short int*)(&var); + unsigned short int bigEndian=*(unsigned short int*)(&var); unsigned char* lit_e=(unsigned char*)&littleEndian; unsigned char* big_e=(unsigned char*)&bigEndian; lit_e[0]=big_e[1]; @@ -524,9 +524,9 @@ int macfwrites(void* var,FILE* file) { return fwrite(lit_e,2,1,file); } -int macfwritel(void* var,FILE* file) { +int macfwritel(const void* var,FILE* file) { unsigned short int littleEndian; - unsigned short int bigEndian=(unsigned short int*)(&var); + unsigned short int bigEndian=*(unsigned short int*)(&var); unsigned char* lit_e=(unsigned char*)&littleEndian; unsigned char* big_e=(unsigned char*)&bigEndian; lit_e[0]=big_e[3];