git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From bbbb4fb9b7c85fde90608710dff09480696c6567 Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Thu, 9 Feb 2012 16:01:56 -0800
   4 Subject: [PATCH] sat_xfopen.c: Forward port to zlib 1.2.6 gzFile
   5
   6 Signed-off-by: Khem Raj <raj.khem@gmail.com>
   7
   8 Upstream-Status: Pending
   9 ---
  10  ext/sat_xfopen.c |   10 +++++-----
  11  1 files changed, 5 insertions(+), 5 deletions(-)
  12
  13 diff --git a/ext/sat_xfopen.c b/ext/sat_xfopen.c
  14 index cf943cf..b3d458d 100644
  15 --- a/ext/sat_xfopen.c
  16 +++ b/ext/sat_xfopen.c
  17 @@ -16,16 +16,16 @@
  18
  19  static ssize_t cookie_gzread(void *cookie, char *buf, size_t nbytes)
  20  {
  21 -  return gzread((gzFile *)cookie, buf, nbytes);
  22 +  return gzread((gzFile)cookie, buf, nbytes);
  23  }
  24
  25  static int
  26  cookie_gzclose(void *cookie)
  27  {
  28 -  return gzclose((gzFile *)cookie);
  29 +  return gzclose((gzFile)cookie);
  30  }
  31
  32 -static FILE *mygzfopen(gzFile* gzf)
  33 +static FILE *mygzfopen(gzFile gzf)
  34  {
  35  #ifdef HAVE_FUNOPEN
  36    return funopen(
  37 @@ -49,7 +49,7 @@ FILE *
  38  sat_xfopen(const char *fn, const char *mode)
  39  {
  40    char *suf;
  41 -  gzFile *gzf;
  42 +  gzFile gzf;
  43
  44    if (!fn)
  45      return 0;
  46 @@ -68,7 +68,7 @@ FILE *
  47  sat_xfopen_fd(const char *fn, int fd, const char *mode)
  48  {
  49    char *suf;
  50 -  gzFile *gzf;
  51 +  gzFile gzf;
  52
  53    suf = fn ? strrchr(fn, '.') : 0;
  54    if (!mode)
  55 --
  56 1.7.5.4
  57