From 280e10195c8c6f6119019b9c4e50f6b236710fac Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 24 Jan 2016 06:50:18 +0100
Subject: [PATCH] Remove zlib_crc32_adjust - reuse zlib_crc32_calculate for
 this

---
 libretro-common/file/file_extract.c         |  7 -------
 libretro-common/include/file/file_extract.h |  2 --
 patch.c                                     | 10 +++++-----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/libretro-common/file/file_extract.c b/libretro-common/file/file_extract.c
index 727f31635d..e675b930a3 100644
--- a/libretro-common/file/file_extract.c
+++ b/libretro-common/file/file_extract.c
@@ -208,13 +208,6 @@ uint32_t zlib_crc32_calculate(uint32_t crc, const uint8_t *data, size_t length)
    return crc32(crc, data, length);
 }
 
-uint32_t zlib_crc32_adjust(uint32_t crc, uint8_t data)
-{
-   /* zlib and nall have different assumptions on "sign" for this 
-    * function. */
-   return ~crc32(~crc, &data, 1);
-}
-
 /**
  * zlib_inflate_data_to_file:
  * @path                        : filename path of archive.
diff --git a/libretro-common/include/file/file_extract.h b/libretro-common/include/file/file_extract.h
index b705eb9f2e..f9c7ce7d91 100644
--- a/libretro-common/include/file/file_extract.h
+++ b/libretro-common/include/file/file_extract.h
@@ -75,8 +75,6 @@ typedef int (*zlib_file_cb)(const char *name, const char *valid_exts,
 
 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);
-
 /**
  * zlib_parse_file:
  * @file                        : filename path of archive
diff --git a/patch.c b/patch.c
index 4844904ae8..c85fe6885d 100644
--- a/patch.c
+++ b/patch.c
@@ -55,7 +55,7 @@ static uint8_t bps_read(struct bps_data *bps)
 {
    uint8_t data = bps->modify_data[bps->modify_offset++];
 #ifdef HAVE_ZLIB
-   bps->modify_checksum = zlib_crc32_adjust(bps->modify_checksum, data);
+   bps->modify_checksum = ~zlib_crc32_calculate(~bps->modify_checksum, &data, 1);
 #endif
    return data;
 }
@@ -84,7 +84,7 @@ static void bps_write(struct bps_data *bps, uint8_t data)
 
    bps->target_data[bps->output_offset++] = data;
 #ifdef HAVE_ZLIB
-   bps->target_checksum = zlib_crc32_adjust(bps->target_checksum, data);
+   bps->target_checksum = ~zlib_crc32_calculate(~bps->target_checksum, &data, 1);
 #endif
 }
 
@@ -220,7 +220,7 @@ static uint8_t ups_patch_read(struct ups_data *data)
    {
       uint8_t n = data->patch_data[data->patch_offset++];
 #ifdef HAVE_ZLIB
-      data->patch_checksum = zlib_crc32_adjust(data->patch_checksum, n);
+      data->patch_checksum = ~zlib_crc32_calculate(~data->patch_checksum, &n, 1);
 #endif
       return n;
    }
@@ -233,7 +233,7 @@ static uint8_t ups_source_read(struct ups_data *data)
    {
       uint8_t n = data->source_data[data->source_offset++];
 #ifdef HAVE_ZLIB
-      data->source_checksum = zlib_crc32_adjust(data->source_checksum, n);
+      data->source_checksum = ~zlib_crc32_calculate(~data->source_checksum, &n, 1);
 #endif
       return n;
    }
@@ -246,7 +246,7 @@ static void ups_target_write(struct ups_data *data, uint8_t n)
    {
       data->target_data[data->target_offset] = n;
 #ifdef HAVE_ZLIB
-      data->target_checksum = zlib_crc32_adjust(data->target_checksum, n);
+      data->target_checksum = ~zlib_crc32_calculate(~data->target_checksum, &n, 1);
 #endif
    }