Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2537) Small changes, especially use fprintf to stderr for warnings and errors instead of plain printf

Browse Source
This commit is contained in:
tron 2005-07-09 09:24:34 +00:00
parent 6a645a3eb8
commit 6cef71b1b2
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
spritecache.c
View File

@ -745,20 +745,16 @@ static const uint16 _openttd_grf_indexes[] = {
/* Check that the supplied MD5 hash matches that stored for the supplied filename */ /* Check that the supplied MD5 hash matches that stored for the supplied filename */
static bool CheckMD5Digest(const MD5File file, md5_byte_t *digest, bool warn) static bool CheckMD5Digest(const MD5File file, md5_byte_t *digest, bool warn)
{ {
int i, matching_bytes=0; uint i;
/* Loop through each byte of the file MD5 and the stored MD5... */ /* Loop through each byte of the file MD5 and the stored MD5... */
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++) if (file.hash[i] != digest[i]) break;
{
if (file.hash[i] == digest[i])
matching_bytes++;
};
/* If all bytes of the MD5's match (i.e. the MD5's match)... */ /* If all bytes of the MD5's match (i.e. the MD5's match)... */
if (matching_bytes == 16) { if (i == 16) {
return true; return true;
} else { } else {
if (warn) printf("MD5 of %s is ****INCORRECT**** - File Corrupt.\n", file.filename); if (warn) fprintf(stderr, "MD5 of %s is ****INCORRECT**** - File Corrupt.\n", file.filename);
return false; return false;
}; };
} }
@ -770,10 +766,6 @@ static bool FileMD5(const MD5File file, bool warn)
FILE *f; FILE *f;
char buf[MAX_PATH]; char buf[MAX_PATH];
md5_state_t filemd5state;
int len=0;
md5_byte_t buffer[1024], digest[16];
// open file // open file
sprintf(buf, "%s%s", _path.data_dir, file.filename); sprintf(buf, "%s%s", _path.data_dir, file.filename);
f = fopen(buf, "rb"); f = fopen(buf, "rb");
@ -789,12 +781,16 @@ static bool FileMD5(const MD5File file, bool warn)
#endif #endif
if (f != NULL) { if (f != NULL) {
md5_state_t filemd5state;
md5_byte_t buffer[1024];
md5_byte_t digest[16];
size_t len;
md5_init(&filemd5state); md5_init(&filemd5state);
while ((len = fread(buffer, 1, 1024, f)) != 0) while ((len = fread(buffer, 1, sizeof(buffer), f)) != 0)
md5_append(&filemd5state, buffer, len); md5_append(&filemd5state, buffer, len);
if (ferror(f)) if (ferror(f) && warn) fprintf(stderr, "Error Reading from %s \n", buf);
if (warn) printf("Error Reading from %s \n", buf);
fclose(f); fclose(f);
md5_finish(&filemd5state, digest); md5_finish(&filemd5state, digest);
@ -816,22 +812,14 @@ void CheckExternalFiles(void)
uint dos = 0; uint dos = 0;
uint win = 0; uint win = 0;
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++) if (FileMD5(files_dos.basic[i], true)) dos++;
if (FileMD5(files_dos.basic[i], true)) for (i = 0; i < 3; i++) if (FileMD5(files_dos.landscape[i], true)) dos++;
dos++;
for (i = 0; i < 3; i++)
if (FileMD5(files_dos.landscape[i], true))
dos++;
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++) if (FileMD5(files_win.basic[i], true)) win++;
if (FileMD5(files_win.basic[i], true)) for (i = 0; i < 3; i++) if (FileMD5(files_win.landscape[i], true)) win++;
win++;
for (i = 0; i < 3; i++)
if (FileMD5(files_win.landscape[i], true))
win++;
if (!FileMD5(sample_cat_win, false) && !FileMD5(sample_cat_dos, false)) if (!FileMD5(sample_cat_win, false) && !FileMD5(sample_cat_dos, false))
printf("Your sample.cat file is corrupted or missing!\n"); fprintf(stderr, "Your sample.cat file is corrupted or missing!\n");
/* /*
* forced DOS palette via command line -> leave it that way * forced DOS palette via command line -> leave it that way