From 7130f0c8d85869caad8f74f5ba6134828957a763 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 24 Jan 2016 21:06:53 +0100
Subject: [PATCH] Move zlib_set_stream to file_archive_zlib

---
 libretro-common/file/file_archive.c         | 31 ++-------------------
 libretro-common/file/file_archive_zlib.c    | 20 +++++++++++++
 libretro-common/formats/png/rpng.c          |  2 +-
 libretro-common/formats/png/rpng_encode.c   |  2 +-
 libretro-common/include/file/file_archive.h |  8 ++----
 5 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/libretro-common/file/file_archive.c b/libretro-common/file/file_archive.c
index a2cfee27e4..8ffa354a6b 100644
--- a/libretro-common/file/file_archive.c
+++ b/libretro-common/file/file_archive.c
@@ -451,12 +451,8 @@ bool file_archive_inflate_data_to_file_init(
    if (!stream)
       goto error;
 
-   zlib_set_stream(stream,
-         csize,
-         size,
-         (const uint8_t*)cdata,
-         handle->data 
-         );
+   handle->backend->stream_set(stream, csize, size,
+         (const uint8_t*)cdata, handle->data);
 
    return true;
 
@@ -730,8 +726,7 @@ end:
  *
  * Returns: string listing of files from archive on success, otherwise NULL.
  **/
-struct string_list *file_archive_get_file_list(
-      const char *path,
+struct string_list *file_archive_get_file_list(const char *path,
       const char *valid_exts)
 {
    struct string_list *list = string_list_new();
@@ -786,23 +781,3 @@ bool file_archive_perform_mode(const char *path, const char *valid_exts,
 
    return true;
 }
-
-void zlib_set_stream(void *data,
-      uint32_t       avail_in,
-      uint32_t       avail_out,
-      const uint8_t *next_in,
-      uint8_t       *next_out
-      )
-{
-   z_stream *stream = (z_stream*)data;
-
-   if (!stream)
-      return;
-
-   stream->avail_in  = avail_in;
-   stream->avail_out = avail_out;
-
-   stream->next_in   = (uint8_t*)next_in;
-   stream->next_out  = next_out;
-}
-
diff --git a/libretro-common/file/file_archive_zlib.c b/libretro-common/file/file_archive_zlib.c
index c98c64b73e..69313431af 100644
--- a/libretro-common/file/file_archive_zlib.c
+++ b/libretro-common/file/file_archive_zlib.c
@@ -38,6 +38,25 @@ static void zlib_stream_free(void *data)
       inflateEnd(ret);
 }
 
+static void zlib_stream_set(void *data,
+      uint32_t       avail_in,
+      uint32_t       avail_out,
+      const uint8_t *next_in,
+      uint8_t       *next_out
+      )
+{
+   z_stream *stream = (z_stream*)data;
+
+   if (!stream)
+      return;
+
+   stream->avail_in  = avail_in;
+   stream->avail_out = avail_out;
+
+   stream->next_in   = (uint8_t*)next_in;
+   stream->next_out  = next_out;
+}
+
 static uint32_t zlib_stream_get_avail_in(void *data)
 {
    z_stream *stream = (z_stream*)data;
@@ -113,6 +132,7 @@ static bool zlib_stream_decompress_init(void *data)
 const struct zlib_file_backend zlib_backend = {
    zlib_stream_new,
    zlib_stream_free,
+   zlib_stream_set,
    zlib_stream_get_avail_in,
    zlib_stream_get_avail_out,
    zlib_stream_get_total_out,
diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c
index 8d38b5eb2c..ff9c85aecc 100644
--- a/libretro-common/formats/png/rpng.c
+++ b/libretro-common/formats/png/rpng.c
@@ -798,7 +798,7 @@ static bool rpng_load_image_argb_process_init(rpng_t *rpng,
    if (!rpng->process.inflate_buf)
       return false;
 
-   zlib_set_stream(
+   rpng->process.stream_backend->stream_set(
          rpng->process.stream,
          rpng->idat_buf.size,
          rpng->process.inflate_buf_size,
diff --git a/libretro-common/formats/png/rpng_encode.c b/libretro-common/formats/png/rpng_encode.c
index 637edcb6b9..4a74eb5c0e 100644
--- a/libretro-common/formats/png/rpng_encode.c
+++ b/libretro-common/formats/png/rpng_encode.c
@@ -328,7 +328,7 @@ static bool rpng_save_image(const char *path,
    if (!stream)
       GOTO_END_ERROR();
 
-   zlib_set_stream(
+   stream_backend->stream_set(
          stream,
          encode_buf_size,
          encode_buf_size * 2,
diff --git a/libretro-common/include/file/file_archive.h b/libretro-common/include/file/file_archive.h
index b779fb55e5..f400a3a8eb 100644
--- a/libretro-common/include/file/file_archive.h
+++ b/libretro-common/include/file/file_archive.h
@@ -41,6 +41,8 @@ struct zlib_file_backend
 {
    void *(*stream_new)(void);
    void  (*stream_free)(void *);
+   void  (*stream_set)(void *, uint32_t, uint32_t,
+         const uint8_t *, uint8_t *);
    uint32_t (*stream_get_avail_in)(void*);
    uint32_t (*stream_get_avail_out)(void*);
    uint64_t (*stream_get_total_out)(void*);
@@ -163,12 +165,6 @@ struct string_list *compressed_file_list_new(const char *filename,
 
 void zlib_deflate_init(void *data, int level);
 
-void zlib_set_stream(void *data,
-      uint32_t       avail_in,
-      uint32_t       avail_out,
-      const uint8_t *next_in,
-      uint8_t       *next_out
-      );
 
 const struct zlib_file_backend *file_archive_get_default_file_backend(void);