lang/php7-pecl-dio/patches/0007-Replace-ZEND_REGISTER_RESOURCE-with-zend_register_re.patch

   1 From dbf03eb09bf1a41bcd140c4edba351121ac24729 Mon Sep 17 00:00:00 2001
   2 From: Michael Heimpold <mhei@heimpold.de>
   3 Date: Wed, 13 Jul 2016 00:36:46 +0200
   4 Subject: [PATCH 07/16] Replace ZEND_REGISTER_RESOURCE with
   5  zend_register_resource
   6
   7 Signed-off-by: Michael Heimpold <mhei@heimpold.de>
   8 ---
   9  dio.c | 12 ++++++------
  10  1 file changed, 6 insertions(+), 6 deletions(-)
  11
  12 diff --git a/dio.c b/dio.c
  13 index 6b687ac..6f2d58c 100644
  14 --- a/dio.c
  15 +++ b/dio.c
  16 @@ -72,9 +72,9 @@ static int new_php_fd(php_fd_t **f, int fd)
  17         return 1;
  18  }
  19
  20 -static void _dio_close_fd(zend_rsrc_list_entry *rsrc TSRMLS_DC)
  21 +static void _dio_close_fd(zend_resource *res)
  22  {
  23 -       php_fd_t *f = (php_fd_t *) rsrc->ptr;
  24 +       php_fd_t *f = (php_fd_t *)zend_fetch_resource(res, NULL, le_fd);
  25         if (f) {
  26                 close(f->fd);
  27                 free(f);
  28 @@ -115,7 +115,7 @@ PHP_FUNCTION(dio_open)
  29                 RETURN_FALSE;
  30         }
  31
  32 -       ZEND_REGISTER_RESOURCE(return_value, f, le_fd);
  33 +       RETVAL_RES(zend_register_resource(f, le_fd));
  34  }
  35  /* }}} */
  36
  37 @@ -144,7 +144,7 @@ PHP_FUNCTION(dio_fdopen)
  38                 RETURN_FALSE;
  39         }
  40
  41 -       ZEND_REGISTER_RESOURCE(return_value, f, le_fd);
  42 +       RETVAL_RES(zend_register_resource(f, le_fd));
  43  }
  44  /* }}} */
  45
  46 @@ -175,7 +175,7 @@ PHP_FUNCTION(dio_dup)
  47                 RETURN_FALSE;
  48         }
  49
  50 -       ZEND_REGISTER_RESOURCE(return_value, df, le_fd);
  51 +       RETVAL_RES(zend_register_resource(f, le_fd));
  52  }
  53  /* }}} */
  54  #endif
  55 @@ -434,7 +434,7 @@ PHP_FUNCTION(dio_fcntl)
  56                         if (!new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)))) {
  57                                 RETURN_FALSE;
  58                         }
  59 -                       ZEND_REGISTER_RESOURCE(return_value, new_f, le_fd);
  60 +                       RETVAL_RES(zend_register_resource(new_f, le_fd));
  61                         break;
  62                 }
  63                 default:
  64 --
  65 2.5.0
  66