diff --git a/content.c b/content.c index 784b173a9a..d8e1fa629f 100644 --- a/content.c +++ b/content.c @@ -98,7 +98,7 @@ static bool read_content_file(unsigned i, const char *path, void **buf, #ifdef HAVE_ZLIB content_ctl(CONTENT_CTL_GET_CRC, &content_crc_ptr); - *content_crc_ptr = zlib_crc32_calculate(ret_buf, *length); + *content_crc_ptr = zlib_crc32_calculate(0, ret_buf, *length); RARCH_LOG("CRC32: 0x%x .\n", (unsigned)*content_crc_ptr); #endif diff --git a/file_ops.c b/file_ops.c index 2d10b38f8a..1694307f01 100644 --- a/file_ops.c +++ b/file_ops.c @@ -400,7 +400,7 @@ static int zip_file_decompressed(const char *name, const char *valid_exts, ret = zlib_inflate_data_to_file_iterate(handle.stream); }while(ret == 0); - handle.real_checksum = zlib_crc32_calculate(handle.data, size); + handle.real_checksum = zlib_crc32_calculate(0, handle.data, size); if (handle.real_checksum != crc32) { diff --git a/libretro-common/file/file_extract.c b/libretro-common/file/file_extract.c index 0d12556534..727f31635d 100644 --- a/libretro-common/file/file_extract.c +++ b/libretro-common/file/file_extract.c @@ -203,9 +203,9 @@ int zlib_inflate_data_to_file_iterate(void *data) return 0; } -uint32_t zlib_crc32_calculate(const uint8_t *data, size_t length) +uint32_t zlib_crc32_calculate(uint32_t crc, const uint8_t *data, size_t length) { - return crc32(0, data, length); + return crc32(crc, data, length); } uint32_t zlib_crc32_adjust(uint32_t crc, uint8_t data) @@ -245,7 +245,7 @@ int zlib_inflate_data_to_file(zlib_file_handle_t *handle, goto end; } - handle->real_checksum = zlib_crc32_calculate(handle->data, size); + handle->real_checksum = zlib_crc32_calculate(0, handle->data, size); #if 0 if (handle->real_checksum != checksum) diff --git a/libretro-common/formats/png/rpng_encode.c b/libretro-common/formats/png/rpng_encode.c index b276ff47c5..d95ee3d570 100644 --- a/libretro-common/formats/png/rpng_encode.c +++ b/libretro-common/formats/png/rpng_encode.c @@ -48,7 +48,7 @@ static void dword_write_be(uint8_t *buf, uint32_t val) static bool png_write_crc(RFILE *file, const uint8_t *data, size_t size) { uint8_t crc_raw[4] = {0}; - uint32_t crc = zlib_crc32_calculate(data, size); + uint32_t crc = zlib_crc32_calculate(0, data, size); dword_write_be(crc_raw, crc); return retro_fwrite(file, crc_raw, sizeof(crc_raw)) == sizeof(crc_raw); diff --git a/libretro-common/include/file/file_extract.h b/libretro-common/include/file/file_extract.h index 18c2b28003..b705eb9f2e 100644 --- a/libretro-common/include/file/file_extract.h +++ b/libretro-common/include/file/file_extract.h @@ -73,7 +73,7 @@ typedef int (*zlib_file_cb)(const char *name, const char *valid_exts, const uint8_t *cdata, unsigned cmode, uint32_t csize, uint32_t size, uint32_t crc32, void *userdata); -uint32_t zlib_crc32_calculate(const uint8_t *data, size_t length); +uint32_t zlib_crc32_calculate(uint32_t crc, const uint8_t *data, size_t length); uint32_t zlib_crc32_adjust(uint32_t crc, uint8_t data); diff --git a/patch.c b/patch.c index ef4e9edf5c..4844904ae8 100644 --- a/patch.c +++ b/patch.c @@ -186,7 +186,7 @@ patch_error_t bps_apply_patch( modify_modify_checksum |= bps_read(&bps) << i; #ifdef HAVE_ZLIB - bps.source_checksum = zlib_crc32_calculate(bps.source_data, bps.source_length); + bps.source_checksum = zlib_crc32_calculate(0, bps.source_data, bps.source_length); #else return PATCH_PATCH_CHECKSUM_INVALID; #endif diff --git a/tasks/task_database.c b/tasks/task_database.c index b964bf2455..75976dd185 100644 --- a/tasks/task_database.c +++ b/tasks/task_database.c @@ -208,7 +208,7 @@ static int database_info_iterate_playlist( #ifdef HAVE_ZLIB - db_state->crc = zlib_crc32_calculate(db_state->buf, ret); + db_state->crc = zlib_crc32_calculate(0, db_state->buf, ret); #endif db->type = DATABASE_TYPE_CRC_LOOKUP; }