[packages/php/PHP_7_1] more type fixes

atler atler at pld-linux.org
Sat Jan 25 03:37:11 CET 2025


commit 834d157539d07fe5bc9b7dcd7392a2dad6a76e13
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jan 23 12:57:59 2025 +0100

    more type fixes

 types.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
---
diff --git a/types.patch b/types.patch
index d836464..51a9dcd 100644
--- a/types.patch
+++ b/types.patch
@@ -75,3 +75,47 @@
  
  	/* if it is a column containing "long" data, perform late binding now */
  	if (C->is_long) {
+--- php-7.3.33/ext/interbase/ibase_events.c.orig	2021-11-16 12:18:38.000000000 +0100
++++ php-7.3.33/ext/interbase/ibase_events.c	2025-01-23 12:24:50.473401624 +0100
+@@ -105,7 +105,7 @@
+ 	 * so we can work around it.
+ 	 */
+ 
+-	*l = (unsigned short) isc_event_block(event_buf, result_buf, count, events[0],
++	*l = (unsigned short) isc_event_block((ISC_UCHAR**)event_buf, (ISC_UCHAR**)result_buf, count, events[0],
+ 		events[1], events[2], events[3], events[4], events[5], events[6], events[7],
+ 		events[8], events[9], events[10], events[11], events[12], events[13], events[14]);
+ 
+--- php-7.3.33/ext/pdo_pgsql/pgsql_statement.c.orig	2021-11-16 12:18:30.000000000 +0100
++++ php-7.3.33/ext/pdo_pgsql/pgsql_statement.c	2025-01-23 12:27:31.864330762 +0100
+@@ -526,7 +526,7 @@
+ 	return 1;
+ }
+ 
+-static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, zend_ulong *len, int *caller_frees )
++static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, size_t *len, int *caller_frees )
+ {
+ 	pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
+ 	struct pdo_column_data *cols = stmt->columns;
+--- php-7.3.33/ext/pdo_sqlite/sqlite_statement.c.orig	2021-11-16 12:18:38.000000000 +0100
++++ php-7.3.33/ext/pdo_sqlite/sqlite_statement.c	2025-01-23 12:28:47.274764904 +0100
+@@ -299,7 +299,7 @@
+ 	return 1;
+ }
+ 
+-static int pdo_sqlite_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, zend_ulong *len, int *caller_frees)
++static int pdo_sqlite_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, size_t *len, int *caller_frees)
+ {
+ 	pdo_sqlite_stmt *S = (pdo_sqlite_stmt*)stmt->driver_data;
+ 	if (!S->stmt) {
+--- php-7.3.33/ext/snmp/snmp.c.orig	2021-11-16 12:18:30.000000000 +0100
++++ php-7.3.33/ext/snmp/snmp.c	2025-01-23 12:32:42.266117764 +0100
+@@ -2022,7 +2022,7 @@
+ }
+ /* }}} */
+ 
+-static HashTable *php_snmp_get_gc(zval *object, zval ***gc_data, int *gc_data_count) /* {{{ */
++static HashTable *php_snmp_get_gc(zval *object, zval **gc_data, int *gc_data_count) /* {{{ */
+ {
+ 	*gc_data = NULL;
+ 	*gc_data_count = 0;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/6f09f2e918484e21decfe1c8583f5a0ffab40951



More information about the pld-cvs-commit mailing list