[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com =?UTF-8?Q?pecl/database/ibm=5Fdb=32=3A=20PHP=20=37=2E=33=3A=20Remove?= =?UTF-8?Q?=20p
From:       venkatesh babu ks <vnkbabu () php ! net>
Date:       2019-04-16 7:10:41
Message-ID: php-mail-de3a74f3df2c8f8484ff6bbd62917934150541642 () git ! php ! net
[Download RAW message or body]

Commit:    96f7317768db114dad71037b54d231da1a76e8ea
Author:    Kevin Adler <kadler@us.ibm.com>         Thu, 31 Jan 2019 00:28:21 -0600
Committer: Abhinav Radke <aradke@rocketsoftware.com>      Tue, 16 Apr 2019 12:40:41 \
                +0530
Parents:   43dcc355b1524aadecd156873bd39cf285160497
Branches:  master

Link:       http://git.php.net/?p=pecl/database/ibm_db2.git;a=commitdiff;h=96f7317768db114dad71037b54d231da1a76e8ea


Log:
PHP 7.3: Remove pointless IS_TYPE_COPYABLE checks

See https://github.com/php/php-src/blob/php-7.3.0/UPGRADING.INTERNALS#L123-L128

It was only used in two places, which both were completely broken:

(Z_TYPE_FLAGS_P(params) & (IS_TYPE_COPYABLE & !IS_TYPE_REFCOUNTED)) will always
be false, since !IS_TYPE_REFCOUNTED is 0. I believe !IS_TYPE_REFCOUNTED was
meant to be ~IS_TYPE_REFCOUNTED, but regardless the above document says that
all checks for IS_TYPE_COPYABLE were replaced with IS_TYPE_ARRAY, which we're
already checking so I just removed the pointless check for all releases.

Changed paths:
  M  ibm_db2.c


Diff:
diff --git a/ibm_db2.c b/ibm_db2.c
index 80fc4c5..1b81619 100644
--- a/ibm_db2.c
+++ b/ibm_db2.c
@@ -5108,7 +5108,7 @@ PHP_FUNCTION(db2_execute)
     }
 
 #if PHP_MAJOR_VERSION >= 7
-    if (parameters_array && Z_TYPE_P(parameters_array) == IS_ARRAY && \
(Z_TYPE_FLAGS_P(parameters_array) & (IS_TYPE_COPYABLE & !IS_TYPE_REFCOUNTED))) { +    \
if (parameters_array && Z_TYPE_P(parameters_array) == IS_ARRAY) {  \
SEPARATE_ARRAY(parameters_array);  }
 #endif
@@ -7827,7 +7827,7 @@ PHP_FUNCTION( db2_execute_many )
     }
 
 #if PHP_MAJOR_VERSION >= 7
-    if (params && Z_TYPE_P(params) == IS_ARRAY && (Z_TYPE_FLAGS_P(params) & \
(IS_TYPE_COPYABLE & !IS_TYPE_REFCOUNTED))) { +    if (params && Z_TYPE_P(params) == \
IS_ARRAY) {  SEPARATE_ARRAY(params);
     }
 #endif


--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]