summaryrefslogtreecommitdiff
path: root/ext/interbase
diff options
context:
space:
mode:
Diffstat (limited to 'ext/interbase')
-rw-r--r--ext/interbase/config.m412
-rw-r--r--ext/interbase/ibase_blobs.c145
-rw-r--r--ext/interbase/ibase_events.c128
-rw-r--r--ext/interbase/ibase_query.c587
-rw-r--r--ext/interbase/ibase_service.c104
-rw-r--r--ext/interbase/interbase.c399
-rw-r--r--ext/interbase/interbase.dsp135
-rw-r--r--ext/interbase/php_ibase_includes.h45
-rw-r--r--ext/interbase/php_ibase_udf.c115
-rw-r--r--ext/interbase/php_interbase.h5
-rw-r--r--ext/interbase/tests/002.phpt2
-rw-r--r--ext/interbase/tests/003.phpt2
-rw-r--r--ext/interbase/tests/004.phpt2
-rw-r--r--ext/interbase/tests/005.phpt2
-rw-r--r--ext/interbase/tests/006.phpt2
-rw-r--r--ext/interbase/tests/007.phpt2
-rw-r--r--ext/interbase/tests/008.phpt2
-rw-r--r--ext/interbase/tests/ibase_close_001.phpt2
-rw-r--r--ext/interbase/tests/ibase_free_query_001.phpt2
-rw-r--r--ext/interbase/tests/ibase_trans_001.phpt4
20 files changed, 777 insertions, 920 deletions
diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index 6aa1b368c0..4f694caeab 100644
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -1,11 +1,11 @@
-PHP_ARG_WITH(interbase,for InterBase support,
-[ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base
- install directory [/usr/interbase]])
+PHP_ARG_WITH(interbase,for Firebird support,
+[ --with-interbase[=DIR] Include Firebird support. DIR is the Firebird base
+ install directory [/opt/firebird]])
if test "$PHP_INTERBASE" != "no"; then
if test "$PHP_INTERBASE" = "yes"; then
- IBASE_INCDIR=/usr/interbase/include
- IBASE_LIBDIR=/usr/interbase/lib
+ IBASE_INCDIR=/opt/firebird/include
+ IBASE_LIBDIR=/opt/firebird/lib
else
IBASE_INCDIR=$PHP_INTERBASE/include
IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR
@@ -23,7 +23,7 @@ if test "$PHP_INTERBASE" != "no"; then
[
IBASE_LIBNAME=ib_util
], [
- AC_MSG_ERROR([libgds, libib_util or libfbclient not found! Check config.log for more information.])
+ AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check config.log for more information.])
], [
-L$IBASE_LIBDIR
])
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c
index c6f895bea3..967a1694c1 100644
--- a/ext/interbase/ibase_blobs.c
+++ b/ext/interbase/ibase_blobs.c
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+
@@ -32,14 +32,14 @@
static int le_blob;
-static void _php_ibase_free_blob(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _php_ibase_free_blob(zend_resource *rsrc) /* {{{ */
{
ibase_blob *ib_blob = (ibase_blob *)rsrc->ptr;
if (ib_blob->bl_handle != NULL) { /* blob open*/
if (isc_cancel_blob(IB_STATUS, &ib_blob->bl_handle)) {
_php_ibase_module_error("You can lose data. Close any blob after reading from or "
- "writing to it. Use ibase_blob_close() before calling ibase_close()" TSRMLS_CC);
+ "writing to it. Use ibase_blob_close() before calling ibase_close()");
}
}
efree(ib_blob);
@@ -48,7 +48,7 @@ static void _php_ibase_free_blob(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
void php_ibase_blobs_minit(INIT_FUNC_ARGS) /* {{{ */
{
- le_blob = zend_register_list_destructors_ex(_php_ibase_free_blob, NULL,
+ le_blob = zend_register_list_destructors_ex(_php_ibase_free_blob, NULL,
"interbase blob", module_number);
}
/* }}} */
@@ -70,18 +70,15 @@ int _php_ibase_string_to_quad(char const *id, ISC_QUAD *qd) /* {{{ */
}
/* }}} */
-char *_php_ibase_quad_to_string(ISC_QUAD const qd) /* {{{ */
+zend_string *_php_ibase_quad_to_string(ISC_QUAD const qd) /* {{{ */
{
- char *result;
-
/* shortcut for most common case */
if (sizeof(ISC_QUAD) == sizeof(ISC_UINT64)) {
- spprintf(&result, BLOB_ID_LEN+1, "0x%0*" LL_MASK "x", 16, *(ISC_UINT64*)(void *) &qd);
+ return strpprintf(BLOB_ID_LEN+1, "0x%0*" LL_MASK "x", 16, *(ISC_UINT64*)(void *) &qd);
} else {
ISC_UINT64 res = ((ISC_UINT64) qd.gds_quad_high << 0x20) | qd.gds_quad_low;
- spprintf(&result, BLOB_ID_LEN+1, "0x%0*" LL_MASK "x", 16, res);
+ return strpprintf(BLOB_ID_LEN+1, "0x%0*" LL_MASK "x", 16, res);
}
- return result;
}
/* }}} */
@@ -93,52 +90,53 @@ typedef struct { /* {{{ */
/* }}} */
} IBASE_BLOBINFO;
-int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long max_len TSRMLS_DC) /* {{{ */
+int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long max_len) /* {{{ */
{
if (ib_blob->bl_qd.gds_quad_high || ib_blob->bl_qd.gds_quad_low) { /*not null ?*/
ISC_STATUS stat;
- char *bl_data;
+ zend_string *bl_data;
unsigned long cur_len;
unsigned short seg_len;
- bl_data = safe_emalloc(1, max_len, 1);
+ bl_data = zend_string_alloc(max_len, 0);
for (cur_len = stat = 0; (stat == 0 || stat == isc_segment) && cur_len < max_len; cur_len += seg_len) {
unsigned short chunk_size = (max_len-cur_len) > USHRT_MAX ? USHRT_MAX
: (unsigned short)(max_len-cur_len);
- stat = isc_get_segment(IB_STATUS, &ib_blob->bl_handle, &seg_len, chunk_size, &bl_data[cur_len]);
+ stat = isc_get_segment(IB_STATUS, &ib_blob->bl_handle, &seg_len, chunk_size, &ZSTR_VAL(bl_data)[cur_len]);
}
- bl_data[cur_len] = '\0';
if (IB_STATUS[0] == 1 && (stat != 0 && stat != isc_segstr_eof && stat != isc_segment)) {
- efree(bl_data);
- _php_ibase_error(TSRMLS_C);
+ zend_string_free(bl_data);
+ _php_ibase_error();
return FAILURE;
}
- RETVAL_STRINGL(bl_data, cur_len, 0);
+ ZSTR_VAL(bl_data)[cur_len] = '\0';
+ ZSTR_LEN(bl_data) = cur_len;
+ RETVAL_NEW_STR(bl_data);
} else { /* null blob */
- RETVAL_STRING("", 1); /* empty string */
+ RETVAL_EMPTY_STRING(); /* empty string */
}
return SUCCESS;
}
/* }}} */
-int _php_ibase_blob_add(zval **string_arg, ibase_blob *ib_blob TSRMLS_DC) /* {{{ */
+int _php_ibase_blob_add(zval *string_arg, ibase_blob *ib_blob) /* {{{ */
{
unsigned long put_cnt = 0, rem_cnt;
unsigned short chunk_size;
convert_to_string_ex(string_arg);
- for (rem_cnt = Z_STRLEN_PP(string_arg); rem_cnt > 0; rem_cnt -= chunk_size) {
+ for (rem_cnt = Z_STRLEN_P(string_arg); rem_cnt > 0; rem_cnt -= chunk_size) {
chunk_size = rem_cnt > USHRT_MAX ? USHRT_MAX : (unsigned short)rem_cnt;
- if (isc_put_segment(IB_STATUS, &ib_blob->bl_handle, chunk_size, &Z_STRVAL_PP(string_arg)[put_cnt] )) {
- _php_ibase_error(TSRMLS_C);
+ if (isc_put_segment(IB_STATUS, &ib_blob->bl_handle, chunk_size, &Z_STRVAL_P(string_arg)[put_cnt] )) {
+ _php_ibase_error();
return FAILURE;
}
put_cnt += chunk_size;
@@ -147,7 +145,7 @@ int _php_ibase_blob_add(zval **string_arg, ibase_blob *ib_blob TSRMLS_DC) /* {{{
}
/* }}} */
-static int _php_ibase_blob_info(isc_blob_handle bl_handle, IBASE_BLOBINFO *bl_info TSRMLS_DC) /* {{{ */
+static int _php_ibase_blob_info(isc_blob_handle bl_handle, IBASE_BLOBINFO *bl_info) /* {{{ */
{
static char bl_items[] = {
isc_info_blob_num_segments,
@@ -164,7 +162,7 @@ static int _php_ibase_blob_info(isc_blob_handle bl_handle, IBASE_BLOBINFO *bl_in
bl_info->bl_stream = 0;
if (isc_blob_info(IB_STATUS, &bl_handle, sizeof(bl_items), bl_items, sizeof(bl_inf), bl_inf)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
return FAILURE;
}
@@ -191,7 +189,7 @@ static int _php_ibase_blob_info(isc_blob_handle bl_handle, IBASE_BLOBINFO *bl_in
break;
case isc_info_truncated:
case isc_info_error: /* hmm. don't think so...*/
- _php_ibase_module_error("PHP module internal error" TSRMLS_CC);
+ _php_ibase_module_error("PHP module internal error");
return FAILURE;
} /* switch */
p += item_len;
@@ -211,7 +209,7 @@ PHP_FUNCTION(ibase_blob_create)
RESET_ERRMSG;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &link)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &link)) {
RETURN_FALSE;
}
@@ -222,12 +220,13 @@ PHP_FUNCTION(ibase_blob_create)
ib_blob->type = BLOB_INPUT;
if (isc_create_blob(IB_STATUS, &ib_link->handle, &trans->handle, &ib_blob->bl_handle, &ib_blob->bl_qd)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
efree(ib_blob);
RETURN_FALSE;
}
- ZEND_REGISTER_RESOURCE(return_value, ib_blob, le_blob);
+ RETVAL_RES(zend_register_resource(ib_blob, le_blob));
+ Z_TRY_ADDREF_P(return_value);
}
/* }}} */
@@ -236,7 +235,7 @@ PHP_FUNCTION(ibase_blob_create)
PHP_FUNCTION(ibase_blob_open)
{
char *blob_id;
- int blob_id_len;
+ size_t blob_id_len;
zval *link = NULL;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
@@ -248,12 +247,12 @@ PHP_FUNCTION(ibase_blob_open)
default:
WRONG_PARAM_COUNT;
case 1:
- if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s", &blob_id, &blob_id_len)) {
+ if (FAILURE == zend_parse_parameters(1, "s", &blob_id, &blob_id_len)) {
RETURN_FALSE;
}
break;
case 2:
- if (FAILURE == zend_parse_parameters(2 TSRMLS_CC, "rs", &link, &blob_id, &blob_id_len)) {
+ if (FAILURE == zend_parse_parameters(2, "rs", &link, &blob_id, &blob_id_len)) {
RETURN_FALSE;
}
break;
@@ -267,17 +266,18 @@ PHP_FUNCTION(ibase_blob_open)
do {
if (! _php_ibase_string_to_quad(blob_id, &ib_blob->bl_qd)) {
- _php_ibase_module_error("String is not a BLOB ID" TSRMLS_CC);
+ _php_ibase_module_error("String is not a BLOB ID");
break;
}
if (isc_open_blob(IB_STATUS, &ib_link->handle, &trans->handle, &ib_blob->bl_handle,
&ib_blob->bl_qd)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
break;
}
- ZEND_REGISTER_RESOURCE(return_value, ib_blob, le_blob);
+ RETVAL_RES(zend_register_resource(ib_blob, le_blob));
+ Z_TRY_ADDREF_P(return_value);
return;
} while (0);
@@ -291,23 +291,23 @@ PHP_FUNCTION(ibase_blob_open)
Add data into created blob */
PHP_FUNCTION(ibase_blob_add)
{
- zval **blob_arg, **string_arg;
+ zval *blob_arg, *string_arg;
ibase_blob *ib_blob;
RESET_ERRMSG;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &blob_arg, &string_arg) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &blob_arg, &string_arg)) {
+ return;
}
- ZEND_FETCH_RESOURCE(ib_blob, ibase_blob *, blob_arg, -1, "Interbase blob", le_blob);
+ ib_blob = (ibase_blob *)zend_fetch_resource_ex(blob_arg, "Interbase blob", le_blob);
if (ib_blob->type != BLOB_INPUT) {
- _php_ibase_module_error("BLOB is not open for input" TSRMLS_CC);
+ _php_ibase_module_error("BLOB is not open for input");
RETURN_FALSE;
}
- if (_php_ibase_blob_add(string_arg, ib_blob TSRMLS_CC) != SUCCESS) {
+ if (_php_ibase_blob_add(string_arg, ib_blob) != SUCCESS) {
RETURN_FALSE;
}
}
@@ -317,25 +317,24 @@ PHP_FUNCTION(ibase_blob_add)
Get len bytes data from open blob */
PHP_FUNCTION(ibase_blob_get)
{
- zval **blob_arg, **len_arg;
+ zval *blob_arg;
+ zend_ulong len_arg;
ibase_blob *ib_blob;
RESET_ERRMSG;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &blob_arg, &len_arg) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &blob_arg, &len_arg)) {
+ return;
}
- ZEND_FETCH_RESOURCE(ib_blob, ibase_blob *, blob_arg, -1, "Interbase blob", le_blob);
+ ib_blob = (ibase_blob *)zend_fetch_resource_ex(blob_arg, "Interbase blob", le_blob);
if (ib_blob->type != BLOB_OUTPUT) {
- _php_ibase_module_error("BLOB is not open for output" TSRMLS_CC);
+ _php_ibase_module_error("BLOB is not open for output");
RETURN_FALSE;
}
- convert_to_long_ex(len_arg);
-
- if (_php_ibase_blob_get(return_value, ib_blob, Z_LVAL_PP(len_arg) TSRMLS_CC) != SUCCESS) {
+ if (_php_ibase_blob_get(return_value, ib_blob, len_arg) != SUCCESS) {
RETURN_FALSE;
}
}
@@ -343,37 +342,37 @@ PHP_FUNCTION(ibase_blob_get)
static void _php_ibase_blob_end(INTERNAL_FUNCTION_PARAMETERS, int bl_end) /* {{{ */
{
- zval **blob_arg;
+ zval *blob_arg;
ibase_blob *ib_blob;
RESET_ERRMSG;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &blob_arg) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r", &blob_arg)) {
+ return;
}
- ZEND_FETCH_RESOURCE(ib_blob, ibase_blob *, blob_arg, -1, "Interbase blob", le_blob);
+ ib_blob = (ibase_blob *)zend_fetch_resource_ex(blob_arg, "Interbase blob", le_blob);
if (bl_end == BLOB_CLOSE) { /* return id here */
if (ib_blob->bl_qd.gds_quad_high || ib_blob->bl_qd.gds_quad_low) { /*not null ?*/
if (isc_close_blob(IB_STATUS, &ib_blob->bl_handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
}
ib_blob->bl_handle = NULL;
- RETVAL_STRINGL(_php_ibase_quad_to_string(ib_blob->bl_qd), BLOB_ID_LEN, 0);
+ RETVAL_NEW_STR(_php_ibase_quad_to_string(ib_blob->bl_qd));
} else { /* discard created blob */
if (isc_cancel_blob(IB_STATUS, &ib_blob->bl_handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
ib_blob->bl_handle = NULL;
RETVAL_TRUE;
}
- zend_list_delete(Z_LVAL_PP(blob_arg));
+ zend_list_delete(Z_RES_P(blob_arg));
}
/* }}} */
@@ -398,7 +397,7 @@ PHP_FUNCTION(ibase_blob_cancel)
PHP_FUNCTION(ibase_blob_info)
{
char *blob_id;
- int blob_id_len;
+ size_t blob_id_len;
zval *link = NULL;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
@@ -411,12 +410,12 @@ PHP_FUNCTION(ibase_blob_info)
default:
WRONG_PARAM_COUNT;
case 1:
- if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s", &blob_id, &blob_id_len)) {
+ if (FAILURE == zend_parse_parameters(1, "s", &blob_id, &blob_id_len)) {
RETURN_FALSE;
}
break;
case 2:
- if (FAILURE == zend_parse_parameters(2 TSRMLS_CC, "rs", &link, &blob_id, &blob_id_len)) {
+ if (FAILURE == zend_parse_parameters(2, "rs", &link, &blob_id, &blob_id_len)) {
RETURN_FALSE;
}
break;
@@ -425,22 +424,22 @@ PHP_FUNCTION(ibase_blob_info)
PHP_IBASE_LINK_TRANS(link, ib_link, trans);
if (! _php_ibase_string_to_quad(blob_id, &ib_blob.bl_qd)) {
- _php_ibase_module_error("Unrecognized BLOB ID" TSRMLS_CC);
+ _php_ibase_module_error("Unrecognized BLOB ID");
RETURN_FALSE;
}
if (ib_blob.bl_qd.gds_quad_high || ib_blob.bl_qd.gds_quad_low) { /* not null ? */
if (isc_open_blob(IB_STATUS, &ib_link->handle, &trans->handle, &ib_blob.bl_handle,
&ib_blob.bl_qd)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
- if (_php_ibase_blob_info(ib_blob.bl_handle, &bl_info TSRMLS_CC)) {
+ if (_php_ibase_blob_info(ib_blob.bl_handle, &bl_info)) {
RETURN_FALSE;
}
if (isc_close_blob(IB_STATUS, &ib_blob.bl_handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
} else { /* null blob, all values to zero */
@@ -474,7 +473,7 @@ PHP_FUNCTION(ibase_blob_info)
PHP_FUNCTION(ibase_blob_echo)
{
char *blob_id;
- int blob_id_len;
+ size_t blob_id_len;
zval *link = NULL;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
@@ -488,12 +487,12 @@ PHP_FUNCTION(ibase_blob_echo)
default:
WRONG_PARAM_COUNT;
case 1:
- if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s", &blob_id, &blob_id_len)) {
+ if (FAILURE == zend_parse_parameters(1, "s", &blob_id, &blob_id_len)) {
RETURN_FALSE;
}
break;
case 2:
- if (FAILURE == zend_parse_parameters(2 TSRMLS_CC, "rs", &link, &blob_id, &blob_id_len)) {
+ if (FAILURE == zend_parse_parameters(2, "rs", &link, &blob_id, &blob_id_len)) {
RETURN_FALSE;
}
break;
@@ -502,7 +501,7 @@ PHP_FUNCTION(ibase_blob_echo)
PHP_IBASE_LINK_TRANS(link, ib_link, trans);
if (! _php_ibase_string_to_quad(blob_id, &ib_blob_id.bl_qd)) {
- _php_ibase_module_error("Unrecognized BLOB ID" TSRMLS_CC);
+ _php_ibase_module_error("Unrecognized BLOB ID");
RETURN_FALSE;
}
@@ -527,7 +526,7 @@ PHP_FUNCTION(ibase_blob_echo)
RETURN_TRUE;
} while (0);
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
/* }}} */
@@ -547,14 +546,14 @@ PHP_FUNCTION(ibase_blob_import)
RESET_ERRMSG;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|r",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r|r",
(ZEND_NUM_ARGS()-1) ? &link : &file, &file)) {
RETURN_FALSE;
}
PHP_IBASE_LINK_TRANS(link, ib_link, trans);
- php_stream_from_zval(stream, &file);
+ php_stream_from_zval(stream, file);
do {
if (isc_create_blob(IB_STATUS, &ib_link->handle, &trans->handle, &ib_blob.bl_handle,
@@ -571,10 +570,10 @@ PHP_FUNCTION(ibase_blob_import)
if (isc_close_blob(IB_STATUS, &ib_blob.bl_handle)) {
break;
}
- RETURN_STRINGL( _php_ibase_quad_to_string(ib_blob.bl_qd), BLOB_ID_LEN, 0);
+ RETURN_NEW_STR(_php_ibase_quad_to_string(ib_blob.bl_qd));
} while (0);
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
/* }}} */
diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c
index 372ad82f21..bac2450d81 100644
--- a/ext/interbase/ibase_events.c
+++ b/ext/interbase/ibase_events.c
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+
@@ -36,7 +36,7 @@ static void _php_ibase_event_free(char *event_buf, char *result_buf) /* {{{ */
}
/* }}} */
-void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */
+void _php_ibase_free_event(ibase_event *event) /* {{{ */
{
unsigned short i;
@@ -47,7 +47,7 @@ void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */
if (event->link->handle != NULL &&
isc_cancel_events(IB_STATUS, &event->link->handle, &event->event_id)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
}
/* delete this event from the link struct */
@@ -55,10 +55,9 @@ void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */
*node = event->event_next;
}
- if (event->callback) {
- zval_dtor(event->callback);
- FREE_ZVAL(event->callback);
- event->callback = NULL;
+ if (Z_TYPE(event->callback) != IS_UNDEF) {
+ zval_dtor(&event->callback);
+ ZVAL_UNDEF(&event->callback);
_php_ibase_event_free(event->event_buffer,event->result_buffer);
@@ -70,11 +69,11 @@ void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */
}
/* }}} */
-static void _php_ibase_free_event_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _php_ibase_free_event_rsrc(zend_resource *rsrc) /* {{{ */
{
ibase_event *e = (ibase_event *) rsrc->ptr;
- _php_ibase_free_event(e TSRMLS_CC);
+ _php_ibase_free_event(e);
efree(e);
}
@@ -82,7 +81,7 @@ static void _php_ibase_free_event_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) /*
void php_ibase_events_minit(INIT_FUNC_ARGS) /* {{{ */
{
- le_event = zend_register_list_destructors_ex(_php_ibase_free_event_rsrc, NULL,
+ le_event = zend_register_list_destructors_ex(_php_ibase_free_event_rsrc, NULL,
"interbase event", module_number);
}
/* }}} */
@@ -124,7 +123,7 @@ static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count,
Waits for any one of the passed Interbase events to be posted by the database, and returns its name */
PHP_FUNCTION(ibase_wait_event)
{
- zval ***args;
+ zval *args;
ibase_db_link *ib_link;
int num_args;
char *event_buffer, *result_buffer, *events[15];
@@ -138,30 +137,27 @@ PHP_FUNCTION(ibase_wait_event)
WRONG_PARAM_COUNT;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &num_args) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &num_args) == FAILURE) {
return;
}
- if (Z_TYPE_PP(args[0]) == IS_RESOURCE) {
- if (!ZEND_FETCH_RESOURCE2_NO_RETURN(ib_link, ibase_db_link *, args[0], -1, "InterBase link", le_link, le_plink)) {
- efree(args);
+ if (Z_TYPE(args[0]) == IS_RESOURCE) {
+ if ((ib_link = (ibase_db_link *)zend_fetch_resource2_ex(&args[0], "InterBase link", le_link, le_plink)) == NULL) {
RETURN_FALSE;
}
i = 1;
} else {
if (ZEND_NUM_ARGS() > 15) {
- efree(args);
WRONG_PARAM_COUNT;
}
- if (!ZEND_FETCH_RESOURCE2_NO_RETURN(ib_link, ibase_db_link *, NULL, IBG(default_link), "InterBase link", le_link, le_plink)) {
- efree(args);
+ if ((ib_link = (ibase_db_link *)zend_fetch_resource2_ex(IBG(default_link), "InterBase link", le_link, le_plink)) == NULL) {
RETURN_FALSE;
}
}
for (; i < ZEND_NUM_ARGS(); ++i) {
- convert_to_string_ex(args[i]);
- events[event_count++] = Z_STRVAL_PP(args[i]);
+ convert_to_string_ex(&args[i]);
+ events[event_count++] = Z_STRVAL(args[i]);
}
/* fills the required data structure with information about the events */
@@ -169,9 +165,8 @@ PHP_FUNCTION(ibase_wait_event)
/* now block until an event occurs */
if (isc_wait_for_event(IB_STATUS, &ib_link->handle, buffer_size, event_buffer, result_buffer)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
_php_ibase_event_free(event_buffer,result_buffer);
- efree(args);
RETURN_FALSE;
}
@@ -179,17 +174,15 @@ PHP_FUNCTION(ibase_wait_event)
isc_event_counts(occurred_event, buffer_size, event_buffer, result_buffer);
for (i = 0; i < event_count; ++i) {
if (occurred_event[i]) {
- char *result = estrdup(events[i]);
+ zend_string *result = zend_string_init(events[i], strlen(events[i]), 0);
_php_ibase_event_free(event_buffer,result_buffer);
- efree(args);
- RETURN_STRING(result,0);
+ RETURN_STR(result);
}
}
/* If we reach this line, isc_wait_for_event() did return, but we don't know
which event fired. */
_php_ibase_event_free(event_buffer,result_buffer);
- efree(args);
RETURN_FALSE;
}
/* }}} */
@@ -197,6 +190,8 @@ PHP_FUNCTION(ibase_wait_event)
static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
unsigned short buffer_size, char *result_buf)
{
+ zval *res;
+
/* this function is called asynchronously by the Interbase client library. */
TSRMLS_FETCH_FROM_CTX(event->thread_ctx);
@@ -208,38 +203,35 @@ static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
switch (event->state) {
unsigned short i;
unsigned long occurred_event[15];
- zval event_name, link_id, return_value, *args[2];
+ zval return_value, args[2];
default: /* == DEAD */
break;
case ACTIVE:
- args[0] = &event_name;
- args[1] = &link_id;
-
/* copy the updated results into the result buffer */
memcpy(event->result_buffer, result_buf, buffer_size);
- INIT_ZVAL(event_name);
- INIT_ZVAL(link_id);
- ZVAL_RESOURCE(&link_id, event->link_res_id);
+ res = zend_hash_index_find(&EG(regular_list), event->link_res_id);
+ ZVAL_RES(&args[1], Z_RES_P(res));
/* find out which event occurred */
isc_event_counts(occurred_event, buffer_size, event->event_buffer, event->result_buffer);
for (i = 0; i < event->event_count; ++i) {
if (occurred_event[i]) {
- ZVAL_STRING(&event_name,event->events[i],0);
+ ZVAL_STRING(&args[0], event->events[i]);
+ efree(event->events[i]);
break;
}
}
/* call the callback provided by the user */
if (SUCCESS != call_user_function(EG(function_table), NULL,
- event->callback, &return_value, 2, args TSRMLS_CC)) {
- _php_ibase_module_error("Error calling callback %s" TSRMLS_CC, Z_STRVAL_P(event->callback));
+ &event->callback, &return_value, 2, args)) {
+ _php_ibase_module_error("Error calling callback %s", Z_STRVAL(event->callback));
break;
}
- if (Z_TYPE(return_value) == IS_BOOL && !Z_BVAL(return_value)) {
+ if (Z_TYPE(return_value) == IS_FALSE) {
event->state = DEAD;
break;
}
@@ -248,7 +240,7 @@ static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
if (isc_que_events(IB_STATUS, &event->link->handle, &event->event_id, buffer_size,
event->event_buffer,(isc_callback)_php_ibase_callback, (void *)event)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
}
event->state = ACTIVE;
}
@@ -265,71 +257,66 @@ PHP_FUNCTION(ibase_set_event_handler)
* link resource id (int) as arguments. The value returned from the function is
* used to determine if the event handler should remain set.
*/
- char *cb_name;
- zval ***args, **cb_arg;
+ zend_string *cb_name;
+ zval *args, *cb_arg;
ibase_db_link *ib_link;
ibase_event *event;
unsigned short i = 1, buffer_size;
int link_res_id, num_args;
RESET_ERRMSG;
-
+
/* Minimum and maximum number of arguments allowed */
if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 17) {
WRONG_PARAM_COUNT;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &num_args) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &num_args) == FAILURE) {
return;
}
/* get a working link */
- if (Z_TYPE_PP(args[0]) != IS_STRING) {
+ if (Z_TYPE(args[0]) != IS_STRING) {
/* resource, callback, event_1 [, ... event_15]
* No more than 15 events
*/
if (ZEND_NUM_ARGS() < 3 || ZEND_NUM_ARGS() > 17) {
- efree(args);
WRONG_PARAM_COUNT;
}
- cb_arg = args[1];
+ cb_arg = &args[1];
i = 2;
- if (!ZEND_FETCH_RESOURCE2_NO_RETURN(ib_link, ibase_db_link *, args[0], -1, "InterBase link", le_link, le_plink)) {
- efree(args);
+ if ((ib_link = (ibase_db_link *)zend_fetch_resource2_ex(&args[0], "InterBase link", le_link, le_plink)) == NULL) {
RETURN_FALSE;
}
- convert_to_long_ex(args[0]);
- link_res_id = Z_LVAL_PP(args[0]);
+ convert_to_long_ex(&args[0]);
+ link_res_id = Z_LVAL(args[0]);
} else {
- /* callback, event_1 [, ... event_15]
+ /* callback, event_1 [, ... event_15]
* No more than 15 events
*/
if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 16) {
- efree(args);
WRONG_PARAM_COUNT;
}
- cb_arg = args[0];
+ cb_arg = &args[0];
- if (!ZEND_FETCH_RESOURCE2_NO_RETURN(ib_link, ibase_db_link *, NULL, IBG(default_link), "InterBase link", le_link, le_plink)) {
- efree(args);
+ if ((ib_link = (ibase_db_link *)zend_fetch_resource2_ex(IBG(default_link), "InterBase link", le_link, le_plink)) == NULL) {
RETURN_FALSE;
}
link_res_id = IBG(default_link);
}
/* get the callback */
- if (!zend_is_callable(*cb_arg, 0, &cb_name TSRMLS_CC)) {
- _php_ibase_module_error("Callback argument %s is not a callable function" TSRMLS_CC, cb_name);
- efree(cb_name);
- efree(args);
+ if (!zend_is_callable(cb_arg, 0, &cb_name)) {
+ _php_ibase_module_error("Callback argument %s is not a callable function", ZSTR_VAL(cb_name));
+ zend_string_release(cb_name);
RETURN_FALSE;
}
- efree(cb_name);
+ zend_string_release(cb_name);
/* allocate the event resource */
event = (ibase_event *) safe_emalloc(sizeof(ibase_event), 1, 0);
@@ -340,14 +327,11 @@ PHP_FUNCTION(ibase_set_event_handler)
event->state = NEW;
event->events = (char **) safe_emalloc(sizeof(char *),ZEND_NUM_ARGS()-i,0);
- ALLOC_ZVAL(event->callback);
- *event->callback = **cb_arg;
- INIT_PZVAL(event->callback);
- zval_copy_ctor(event->callback);
+ ZVAL_DUP(&event->callback, cb_arg);
for (; i < ZEND_NUM_ARGS(); ++i) {
- convert_to_string_ex(args[i]);
- event->events[event->event_count++] = estrdup(Z_STRVAL_PP(args[i]));
+ convert_to_string_ex(&args[i]);
+ event->events[event->event_count++] = estrdup(Z_STRVAL(args[i]));
}
/* fills the required data structure with information about the events */
@@ -358,18 +342,16 @@ PHP_FUNCTION(ibase_set_event_handler)
if (isc_que_events(IB_STATUS, &ib_link->handle, &event->event_id, buffer_size,
event->event_buffer,(isc_callback)_php_ibase_callback, (void *)event)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
efree(event);
- efree(args);
RETURN_FALSE;
}
event->event_next = ib_link->event_head;
ib_link->event_head = event;
- ZEND_REGISTER_RESOURCE(return_value, event, le_event);
- zend_list_addref(Z_LVAL_P(return_value));
- efree(args);
+ RETVAL_RES(zend_register_resource(event, le_event));
+ Z_TRY_ADDREF_P(return_value);
}
/* }}} */
@@ -381,14 +363,14 @@ PHP_FUNCTION(ibase_free_event_handler)
RESET_ERRMSG;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &event_arg)) {
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "r", &event_arg)) {
ibase_event *event;
- ZEND_FETCH_RESOURCE(event, ibase_event *, &event_arg, -1, "Interbase event", le_event);
+ event = (ibase_event *)zend_fetch_resource_ex(event_arg, "Interbase event", le_event);
event->state = DEAD;
- zend_list_delete(Z_LVAL_P(event_arg));
+ zend_list_delete(Z_RES_P(event_arg));
RETURN_TRUE;
} else {
RETURN_FALSE;
diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c
index e016d70c90..eaf06ed86c 100644
--- a/ext/interbase/ibase_query.c
+++ b/ext/interbase/ibase_query.c
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+
@@ -75,7 +75,7 @@ typedef struct {
char vary_string[1];
} IBVARY;
-/* sql variables union
+/* sql variables union
* used for convert and binding input variables
*/
typedef struct {
@@ -116,7 +116,7 @@ static void _php_ibase_free_xsqlda(XSQLDA *sqlda) /* {{{ */
}
/* }}} */
-static void _php_ibase_free_stmt_handle(ibase_db_link *link, isc_stmt_handle stmt TSRMLS_DC) /* {{{ */
+static void _php_ibase_free_stmt_handle(ibase_db_link *link, isc_stmt_handle stmt) /* {{{ */
{
static char info[] = { isc_info_base_level, isc_info_end };
@@ -124,17 +124,17 @@ static void _php_ibase_free_stmt_handle(ibase_db_link *link, isc_stmt_handle stm
char res_buf[8];
IBDEBUG("Dropping statement handle (free_stmt_handle)...");
/* Only free statement if db-connection is still open */
- if (SUCCESS == isc_database_info(IB_STATUS, &link->handle,
+ if (SUCCESS == isc_database_info(IB_STATUS, &link->handle,
sizeof(info), info, sizeof(res_buf), res_buf)) {
if (isc_dsql_free_statement(IB_STATUS, &stmt, DSQL_drop)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
}
}
}
}
/* }}} */
-static void _php_ibase_free_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _php_ibase_free_result(zend_resource *rsrc) /* {{{ */
{
ibase_result *ib_result = (ibase_result *) rsrc->ptr;
@@ -145,14 +145,14 @@ static void _php_ibase_free_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{
IBDEBUG("query still valid; don't drop statement handle");
ib_result->query->result = NULL; /* Indicate to query, that result is released */
} else {
- _php_ibase_free_stmt_handle(ib_result->link, ib_result->stmt TSRMLS_CC);
+ _php_ibase_free_stmt_handle(ib_result->link, ib_result->stmt);
}
efree(ib_result);
}
}
/* }}} */
-static void _php_ibase_free_query(ibase_query *ib_query TSRMLS_DC) /* {{{ */
+static void _php_ibase_free_query(ibase_query *ib_query) /* {{{ */
{
IBDEBUG("Freeing query...");
@@ -166,7 +166,7 @@ static void _php_ibase_free_query(ibase_query *ib_query TSRMLS_DC) /* {{{ */
IBDEBUG("result still valid; don't drop statement handle");
ib_query->result->query = NULL; /* Indicate to result, that query is released */
} else {
- _php_ibase_free_stmt_handle(ib_query->link, ib_query->stmt TSRMLS_CC);
+ _php_ibase_free_stmt_handle(ib_query->link, ib_query->stmt);
}
if (ib_query->in_array) {
efree(ib_query->in_array);
@@ -180,13 +180,13 @@ static void _php_ibase_free_query(ibase_query *ib_query TSRMLS_DC) /* {{{ */
}
/* }}} */
-static void php_ibase_free_query_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void php_ibase_free_query_rsrc(zend_resource *rsrc) /* {{{ */
{
ibase_query *ib_query = (ibase_query *)rsrc->ptr;
if (ib_query != NULL) {
IBDEBUG("Preparing to free query by dtor...");
- _php_ibase_free_query(ib_query TSRMLS_CC);
+ _php_ibase_free_query(ib_query);
efree(ib_query);
}
}
@@ -194,15 +194,15 @@ static void php_ibase_free_query_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {
void php_ibase_query_minit(INIT_FUNC_ARGS) /* {{{ */
{
- le_result = zend_register_list_destructors_ex(_php_ibase_free_result, NULL,
+ le_result = zend_register_list_destructors_ex(_php_ibase_free_result, NULL,
"interbase result", module_number);
- le_query = zend_register_list_destructors_ex(php_ibase_free_query_rsrc, NULL,
+ le_query = zend_register_list_destructors_ex(php_ibase_free_query_rsrc, NULL,
"interbase query", module_number);
}
/* }}} */
static int _php_ibase_alloc_array(ibase_array **ib_arrayp, XSQLDA *sqlda, /* {{{ */
- isc_db_handle link, isc_tr_handle trans, unsigned short *array_cnt TSRMLS_DC)
+ isc_db_handle link, isc_tr_handle trans, unsigned short *array_cnt)
{
unsigned short i, n;
ibase_array *ar;
@@ -228,7 +228,7 @@ static int _php_ibase_alloc_array(ibase_array **ib_arrayp, XSQLDA *sqlda, /* {{{
if (isc_array_lookup_bounds(IB_STATUS, &link, &trans, var->relname,
var->sqlname, ar_desc)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
efree(ar);
return FAILURE;
}
@@ -275,7 +275,7 @@ static int _php_ibase_alloc_array(ibase_array **ib_arrayp, XSQLDA *sqlda, /* {{{
case blr_varying2:
/**
* IB has a strange way of handling VARCHAR arrays. It doesn't store
- * the length in the first short, as with VARCHAR fields. It does,
+ * the length in the first short, as with VARCHAR fields. It does,
* however, expect the extra short to be allocated for each element.
*/
a->el_type = SQL_TEXT;
@@ -286,14 +286,14 @@ static int _php_ibase_alloc_array(ibase_array **ib_arrayp, XSQLDA *sqlda, /* {{{
case blr_cstring:
case blr_cstring2:
/**
- * These types are mentioned as array types in the manual, but I
+ * These types are mentioned as array types in the manual, but I
* wouldn't know how to create an array field with any of these
* types. I assume these types are not applicable to arrays, and
* were mentioned erroneously.
*/
default:
- _php_ibase_module_error("Unsupported array type %d in relation '%s' column '%s'"
- TSRMLS_CC, ar_desc->array_desc_dtype, var->relname, var->sqlname);
+ _php_ibase_module_error("Unsupported array type %d in relation '%s' column '%s'",
+ ar_desc->array_desc_dtype, var->relname, var->sqlname);
efree(ar);
return FAILURE;
} /* switch array_desc_type */
@@ -313,14 +313,14 @@ static int _php_ibase_alloc_array(ibase_array **ib_arrayp, XSQLDA *sqlda, /* {{{
/* allocate and prepare query */
static int _php_ibase_alloc_query(ibase_query *ib_query, ibase_db_link *link, /* {{{ */
- ibase_trans *trans, char *query, unsigned short dialect, int trans_res_id TSRMLS_DC)
+ ibase_trans *trans, char *query, unsigned short dialect, int trans_res_id)
{
static char info_type[] = {isc_info_sql_stmt_type};
char result[8];
/* Return FAILURE, if querystring is empty */
if (*query == '\0') {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Querystring empty.");
+ php_error_docref(NULL, E_WARNING, "Querystring empty.");
return FAILURE;
}
@@ -338,7 +338,7 @@ static int _php_ibase_alloc_query(ibase_query *ib_query, ibase_db_link *link, /*
ib_query->in_sqlda = NULL;
if (isc_dsql_allocate_statement(IB_STATUS, &link->handle, &ib_query->stmt)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_alloc_query_error;
}
@@ -348,17 +348,17 @@ static int _php_ibase_alloc_query(ibase_query *ib_query, ibase_db_link *link, /*
if (isc_dsql_prepare(IB_STATUS, &ib_query->trans->handle, &ib_query->stmt,
0, query, dialect, ib_query->out_sqlda)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_alloc_query_error;
}
/* find out what kind of statement was prepared */
- if (isc_dsql_sql_info(IB_STATUS, &ib_query->stmt, sizeof(info_type),
+ if (isc_dsql_sql_info(IB_STATUS, &ib_query->stmt, sizeof(info_type),
info_type, sizeof(result), result)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_alloc_query_error;
}
- ib_query->statement_type = result[3];
+ ib_query->statement_type = result[3];
/* not enough output variables ? */
if (ib_query->out_sqlda->sqld > ib_query->out_sqlda->sqln) {
@@ -366,7 +366,7 @@ static int _php_ibase_alloc_query(ibase_query *ib_query, ibase_db_link *link, /*
ib_query->out_sqlda->sqln = ib_query->out_sqlda->sqld;
ib_query->out_sqlda->version = SQLDA_CURRENT_VERSION;
if (isc_dsql_describe(IB_STATUS, &ib_query->stmt, SQLDA_CURRENT_VERSION, ib_query->out_sqlda)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_alloc_query_error;
}
}
@@ -376,7 +376,7 @@ static int _php_ibase_alloc_query(ibase_query *ib_query, ibase_db_link *link, /*
ib_query->in_sqlda->sqln = 1;
ib_query->in_sqlda->version = SQLDA_CURRENT_VERSION;
if (isc_dsql_describe_bind(IB_STATUS, &ib_query->stmt, SQLDA_CURRENT_VERSION, ib_query->in_sqlda)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_alloc_query_error;
}
@@ -388,7 +388,7 @@ static int _php_ibase_alloc_query(ibase_query *ib_query, ibase_db_link *link, /*
if (isc_dsql_describe_bind(IB_STATUS, &ib_query->stmt,
SQLDA_CURRENT_VERSION, ib_query->in_sqlda)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_alloc_query_error;
}
}
@@ -398,7 +398,7 @@ static int _php_ibase_alloc_query(ibase_query *ib_query, ibase_db_link *link, /*
efree(ib_query->in_sqlda);
ib_query->in_sqlda = NULL;
} else if (FAILURE == _php_ibase_alloc_array(&ib_query->in_array, ib_query->in_sqlda,
- link->handle, trans->handle, &ib_query->in_array_cnt TSRMLS_CC)) {
+ link->handle, trans->handle, &ib_query->in_array_cnt)) {
goto _php_ibase_alloc_query_error;
}
@@ -406,7 +406,7 @@ static int _php_ibase_alloc_query(ibase_query *ib_query, ibase_db_link *link, /*
efree(ib_query->out_sqlda);
ib_query->out_sqlda = NULL;
} else if (FAILURE == _php_ibase_alloc_array(&ib_query->out_array, ib_query->out_sqlda,
- link->handle, trans->handle, &ib_query->out_array_cnt TSRMLS_CC)) {
+ link->handle, trans->handle, &ib_query->out_array_cnt)) {
goto _php_ibase_alloc_query_error;
}
@@ -431,7 +431,7 @@ _php_ibase_alloc_query_error:
/* }}} */
static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /* {{{ */
- ibase_array *array, int dim TSRMLS_DC)
+ ibase_array *array, int dim)
{
zval null_val, *pnull_val = &null_val;
int u_bound = array->ar_desc.array_desc_bounds[dim].array_bound_upper,
@@ -443,21 +443,21 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
if (dim < array->ar_desc.array_desc_dimensions) {
unsigned long slice_size = buf_size / dim_len;
unsigned short i;
- zval **subval = &val;
+ zval *subval = val;
if (Z_TYPE_P(val) == IS_ARRAY) {
zend_hash_internal_pointer_reset(Z_ARRVAL_P(val));
}
- for (i = 0; i < dim_len; ++i) {
+ for (i = 0; i < dim_len; ++i) {
if (Z_TYPE_P(val) == IS_ARRAY &&
- zend_hash_get_current_data(Z_ARRVAL_P(val), (void *) &subval) == FAILURE)
+ (subval = zend_hash_get_current_data(Z_ARRVAL_P(val))) == NULL)
{
- subval = &pnull_val;
+ subval = pnull_val;
}
- if (_php_ibase_bind_array(*subval, buf, slice_size, array, dim+1 TSRMLS_CC) == FAILURE)
+ if (_php_ibase_bind_array(subval, buf, slice_size, array, dim+1) == FAILURE)
{
return FAILURE;
}
@@ -492,14 +492,14 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
switch (array->el_type) {
case SQL_SHORT:
if (l > SHRT_MAX || l < SHRT_MIN) {
- _php_ibase_module_error("Array parameter exceeds field width" TSRMLS_CC);
+ _php_ibase_module_error("Array parameter exceeds field width");
return FAILURE;
}
*(short*) buf = (short) l;
break;
case SQL_LONG:
if (l > ISC_LONG_MAX || l < ISC_LONG_MIN) {
- _php_ibase_module_error("Array parameter exceeds field width" TSRMLS_CC);
+ _php_ibase_module_error("Array parameter exceeds field width");
return FAILURE;
}
*(ISC_LONG*) buf = (ISC_LONG) l;
@@ -511,21 +511,21 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
convert_to_string(val);
if (!sscanf(Z_STRVAL_P(val), "%Lf", &l)) {
- _php_ibase_module_error("Cannot convert '%s' to long double"
- TSRMLS_CC, Z_STRVAL_P(val));
+ _php_ibase_module_error("Cannot convert '%s' to long double",
+ Z_STRVAL_P(val));
return FAILURE;
}
if (l > 0) {
- *(ISC_INT64 *) buf = (ISC_INT64) (l * pow(10,
+ *(ISC_INT64 *) buf = (ISC_INT64) (l * pow(10,
-array->ar_desc.array_desc_scale) + .5);
} else {
- *(ISC_INT64 *) buf = (ISC_INT64) (l * pow(10,
+ *(ISC_INT64 *) buf = (ISC_INT64) (l * pow(10,
-array->ar_desc.array_desc_scale) - .5);
}
}
break;
- }
+ }
} else {
struct tm t = { 0, 0, 0, 0, 0, 0 };
@@ -536,7 +536,7 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
case SQL_SHORT:
convert_to_long(val);
if (Z_LVAL_P(val) > SHRT_MAX || Z_LVAL_P(val) < SHRT_MIN) {
- _php_ibase_module_error("Array parameter exceeds field width" TSRMLS_CC);
+ _php_ibase_module_error("Array parameter exceeds field width");
return FAILURE;
}
*(short *) buf = (short) Z_LVAL_P(val);
@@ -545,7 +545,7 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
convert_to_long(val);
#if (SIZEOF_LONG > 4)
if (Z_LVAL_P(val) > ISC_LONG_MAX || Z_LVAL_P(val) < ISC_LONG_MIN) {
- _php_ibase_module_error("Array parameter exceeds field width" TSRMLS_CC);
+ _php_ibase_module_error("Array parameter exceeds field width");
return FAILURE;
}
#endif
@@ -558,8 +558,8 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
#else
convert_to_string(val);
if (!sscanf(Z_STRVAL_P(val), "%" LL_MASK "d", &l)) {
- _php_ibase_module_error("Cannot convert '%s' to long integer"
- TSRMLS_CC, Z_STRVAL_P(val));
+ _php_ibase_module_error("Cannot convert '%s' to long integer",
+ Z_STRVAL_P(val));
return FAILURE;
} else {
*(ISC_INT64 *) buf = l;
@@ -579,12 +579,12 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
#ifdef HAVE_STRPTIME
strptime(Z_STRVAL_P(val), INI_STR("ibase.timestampformat"), &t);
#else
- n = sscanf(Z_STRVAL_P(val), "%d%*[/]%d%*[/]%d %d%*[:]%d%*[:]%d",
+ n = sscanf(Z_STRVAL_P(val), "%d%*[/]%d%*[/]%d %d%*[:]%d%*[:]%d",
&t.tm_mon, &t.tm_mday, &t.tm_year, &t.tm_hour, &t.tm_min, &t.tm_sec);
if (n != 3 && n != 6) {
_php_ibase_module_error("Invalid date/time format (expected 3 or 6 fields, got %d."
- " Use format 'm/d/Y H:i:s'. You gave '%s')" TSRMLS_CC, n, Z_STRVAL_P(val));
+ " Use format 'm/d/Y H:i:s'. You gave '%s')", n, Z_STRVAL_P(val));
return FAILURE;
}
t.tm_year -= 1900;
@@ -601,7 +601,7 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
if (n != 3) {
_php_ibase_module_error("Invalid date format (expected 3 fields, got %d. "
- "Use format 'm/d/Y' You gave '%s')" TSRMLS_CC, n, Z_STRVAL_P(val));
+ "Use format 'm/d/Y' You gave '%s')", n, Z_STRVAL_P(val));
return FAILURE;
}
t.tm_year -= 1900;
@@ -618,7 +618,7 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
if (n != 3) {
_php_ibase_module_error("Invalid time format (expected 3 fields, got %d. "
- "Use format 'H:i:s'. You gave '%s')" TSRMLS_CC, n, Z_STRVAL_P(val));
+ "Use format 'H:i:s'. You gave '%s')", n, Z_STRVAL_P(val));
return FAILURE;
}
#endif
@@ -631,17 +631,17 @@ static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /
}
}
return SUCCESS;
-}
+}
/* }}} */
-static int _php_ibase_bind(XSQLDA *sqlda, zval ***b_vars, BIND_BUF *buf, /* {{{ */
- ibase_query *ib_query TSRMLS_DC)
+static int _php_ibase_bind(XSQLDA *sqlda, zval *b_vars, BIND_BUF *buf, /* {{{ */
+ ibase_query *ib_query)
{
int i, array_cnt = 0, rv = SUCCESS;
for (i = 0; i < sqlda->sqld; ++i) { /* bound vars */
- zval *b_var = *b_vars[i];
+ zval *b_var = &b_vars[i];
XSQLVAR *var = &sqlda->sqlvar[i];
var->sqlind = &buf[i].sqlind;
@@ -741,16 +741,16 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval ***b_vars, BIND_BUF *buf, /* {{{
if (isc_create_blob(IB_STATUS, &ib_query->link->handle,
&ib_query->trans->handle, &ib_blob.bl_handle, &ib_blob.bl_qd)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
return FAILURE;
}
- if (_php_ibase_blob_add(&b_var, &ib_blob TSRMLS_CC) != SUCCESS) {
+ if (_php_ibase_blob_add(b_var, &ib_blob) != SUCCESS) {
return FAILURE;
}
if (isc_close_blob(IB_STATUS, &ib_blob.bl_handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
return FAILURE;
}
buf[i].val.qval = ib_blob.bl_qd;
@@ -765,7 +765,7 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval ***b_vars, BIND_BUF *buf, /* {{{
if (Z_STRLEN_P(b_var) != BLOB_ID_LEN ||
!_php_ibase_string_to_quad(Z_STRVAL_P(b_var), &buf[i].val.qval)) {
- _php_ibase_module_error("Parameter %d: invalid array ID" TSRMLS_CC,i+1);
+ _php_ibase_module_error("Parameter %d: invalid array ID",i+1);
rv = FAILURE;
}
} else {
@@ -774,24 +774,23 @@ static int _php_ibase_bind(XSQLDA *sqlda, zval ***b_vars, BIND_BUF *buf, /* {{{
void *array_data = emalloc(ar->ar_size);
ISC_QUAD array_id = { 0, 0 };
- if (FAILURE == _php_ibase_bind_array(b_var, array_data, ar->ar_size,
- ar, 0 TSRMLS_CC)) {
- _php_ibase_module_error("Parameter %d: failed to bind array argument"
- TSRMLS_CC,i+1);
+ if (FAILURE == _php_ibase_bind_array(b_var, array_data, ar->ar_size,
+ ar, 0)) {
+ _php_ibase_module_error("Parameter %d: failed to bind array argument", i+1);
efree(array_data);
rv = FAILURE;
continue;
}
- if (isc_array_put_slice(IB_STATUS, &ib_query->link->handle, &ib_query->trans->handle,
+ if (isc_array_put_slice(IB_STATUS, &ib_query->link->handle, &ib_query->trans->handle,
&array_id, &ar->ar_desc, array_data, &ar->ar_size)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
efree(array_data);
return FAILURE;
}
buf[i].val.qval = array_id;
efree(array_data);
- }
+ }
++array_cnt;
continue;
} /* switch */
@@ -860,7 +859,7 @@ static void _php_ibase_alloc_xsqlda(XSQLDA *sqlda) /* {{{ */
/* }}} */
static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resultp, /* {{{ */
- ibase_query *ib_query, zval ***args)
+ ibase_query *ib_query, zval *args)
{
XSQLDA *in_sqlda = NULL, *out_sqlda = NULL;
BIND_BUF *bind_buf = NULL;
@@ -869,11 +868,11 @@ static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resul
char result[64];
ISC_STATUS isc_result;
int argc = ib_query->in_sqlda ? ib_query->in_sqlda->sqld : 0;
-
+
RESET_ERRMSG;
for (i = 0; i < argc; ++i) {
- SEPARATE_ZVAL(args[i]);
+ SEPARATE_ZVAL(&args[i]);
}
switch (ib_query->statement_type) {
@@ -886,9 +885,9 @@ static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resul
/* a SET TRANSACTION statement should be executed with a NULL trans handle */
tr = NULL;
- if (isc_dsql_execute_immediate(IB_STATUS, &ib_query->link->handle, &tr, 0,
+ if (isc_dsql_execute_immediate(IB_STATUS, &ib_query->link->handle, &tr, 0,
ib_query->query, ib_query->dialect, NULL)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_exec_error;
}
@@ -910,23 +909,25 @@ static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resul
(*l)->trans = trans;
(*l)->next = NULL;
- ZEND_REGISTER_RESOURCE(return_value, trans, le_trans);
+ RETVAL_RES(zend_register_resource(trans, le_trans));
+ Z_TRY_ADDREF_P(return_value);
return SUCCESS;
case isc_info_sql_stmt_commit:
case isc_info_sql_stmt_rollback:
- if (isc_dsql_execute_immediate(IB_STATUS, &ib_query->link->handle,
+ if (isc_dsql_execute_immediate(IB_STATUS, &ib_query->link->handle,
&ib_query->trans->handle, 0, ib_query->query, ib_query->dialect, NULL)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_exec_error;
}
if (ib_query->trans->handle == NULL && ib_query->trans_res_id != 0) {
- /* transaction was released by the query and was a registered resource,
+ /* transaction was released by the query and was a registered resource,
so we have to release it */
- zend_list_delete(ib_query->trans_res_id);
+ zval *res = zend_hash_index_find(&EG(regular_list), ib_query->trans_res_id);
+ zend_list_delete(Z_RES_P(res));
}
RETVAL_TRUE;
@@ -967,7 +968,7 @@ static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resul
in_sqlda = emalloc(XSQLDA_LENGTH(ib_query->in_sqlda->sqld));
memcpy(in_sqlda, ib_query->in_sqlda, XSQLDA_LENGTH(ib_query->in_sqlda->sqld));
bind_buf = safe_emalloc(sizeof(BIND_BUF), ib_query->in_sqlda->sqld, 0);
- if (_php_ibase_bind(in_sqlda, args, bind_buf, ib_query TSRMLS_CC) == FAILURE) {
+ if (_php_ibase_bind(in_sqlda, args, bind_buf, ib_query) == FAILURE) {
IBDEBUG("Could not bind input XSQLDA");
goto _php_ibase_exec_error;
}
@@ -982,7 +983,7 @@ static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resul
}
if (isc_result) {
IBDEBUG("Could not execute query");
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_exec_error;
}
ib_query->trans->affected_rows = 0;
@@ -998,7 +999,7 @@ static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resul
if (isc_dsql_sql_info(IB_STATUS, &ib_query->stmt, sizeof(info_count),
info_count, sizeof(result), result)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_exec_error;
}
@@ -1058,9 +1059,10 @@ _php_ibase_exec_error:
Execute a query */
PHP_FUNCTION(ibase_query)
{
- zval *zlink, *ztrans, ***bind_args = NULL;
+ zval *zlink, *ztrans, *bind_args = NULL;
char *query;
- int bind_i, query_len, bind_num;
+ size_t query_len;
+ int bind_i, bind_num;
long trans_res_id = 0;
ibase_db_link *ib_link = NULL;
ibase_trans *trans = NULL;
@@ -1068,60 +1070,60 @@ PHP_FUNCTION(ibase_query)
ibase_result *result = NULL;
RESET_ERRMSG;
-
+
RETVAL_FALSE;
switch (ZEND_NUM_ARGS()) {
- long l;
+ zend_long l;
default:
- if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 3 TSRMLS_CC, "rrs",
+ if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 3, "rrs",
&zlink, &ztrans, &query, &query_len)) {
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link*, &zlink, -1, LE_LINK, le_link, le_plink);
- ZEND_FETCH_RESOURCE(trans, ibase_trans*, &ztrans, -1, LE_TRANS, le_trans);
-
- trans_res_id = Z_LVAL_P(ztrans);
+ ib_link = (ibase_db_link*)zend_fetch_resource2_ex(zlink, LE_LINK, le_link, le_plink);
+ trans = (ibase_trans*)zend_fetch_resource_ex(ztrans, LE_TRANS, le_trans);
+
+ trans_res_id = Z_RES_P(ztrans)->handle;
bind_i = 3;
break;
}
case 2:
- if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 2 TSRMLS_CC, "rs",
+ if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, 2, "rs",
&zlink, &query, &query_len)) {
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, &zlink, &ib_link, &trans);
-
+ _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, zlink, &ib_link, &trans);
+
if (trans != NULL) {
- trans_res_id = Z_LVAL_P(zlink);
+ trans_res_id = Z_RES_P(zlink)->handle;
}
bind_i = 2;
break;
}
/* the statement is 'CREATE DATABASE ...' if the link argument is IBASE_CREATE */
- if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
- TSRMLS_CC, "ls", &l, &query, &query_len) && l == PHP_IBASE_CREATE) {
+ if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
+ "ls", &l, &query, &query_len) && l == PHP_IBASE_CREATE) {
isc_db_handle db = NULL;
isc_tr_handle trans = NULL;
if (PG(sql_safe_mode)) {
_php_ibase_module_error("CREATE DATABASE is not allowed in SQL safe mode"
- TSRMLS_CC);
+ );
} else if (((l = INI_INT("ibase.max_links")) != -1) && (IBG(num_links) >= l)) {
_php_ibase_module_error("CREATE DATABASE is not allowed: maximum link count "
- "(%ld) reached" TSRMLS_CC, l);
+ "(%ld) reached", l);
- } else if (isc_dsql_execute_immediate(IB_STATUS, &db, &trans, (short)query_len,
+ } else if (isc_dsql_execute_immediate(IB_STATUS, &db, &trans, (short)query_len,
query, SQL_DIALECT_CURRENT, NULL)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
} else if (!db) {
_php_ibase_module_error("Connection to created database could not be "
- "established" TSRMLS_CC);
+ "established");
} else {
- /* register the link as a resource; unfortunately, we cannot register
+ /* register the link as a resource; unfortunately, we cannot register
it in the hash table, because we don't know the connection params */
ib_link = (ibase_db_link *) emalloc(sizeof(ibase_db_link));
ib_link->handle = db;
@@ -1129,18 +1131,18 @@ PHP_FUNCTION(ibase_query)
ib_link->tr_list = NULL;
ib_link->event_head = NULL;
- ZEND_REGISTER_RESOURCE(return_value, ib_link, le_link);
- zend_list_addref(Z_LVAL_P(return_value));
- IBG(default_link) = Z_LVAL_P(return_value);
+ RETVAL_RES(zend_register_resource(ib_link, le_link));
+ Z_TRY_ADDREF_P(return_value);
+ IBG(default_link) = Z_RES_P(return_value)->handle;
++IBG(num_links);
}
return;
- }
+ }
case 1:
case 0:
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() ? 1 : 0 TSRMLS_CC, "s", &query,
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() ? 1 : 0, "s", &query,
&query_len)) {
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, IBG(default_link), LE_LINK,
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(IBG(default_link), LE_LINK,
le_link, le_plink);
bind_i = 1;
@@ -1150,49 +1152,47 @@ PHP_FUNCTION(ibase_query)
}
/* open default transaction */
- if (ib_link == NULL || FAILURE == _php_ibase_def_trans(ib_link, &trans TSRMLS_CC)
+ if (ib_link == NULL || FAILURE == _php_ibase_def_trans(ib_link, &trans)
|| FAILURE == _php_ibase_alloc_query(&ib_query, ib_link, trans, query, ib_link->dialect,
- trans_res_id TSRMLS_CC)) {
+ trans_res_id)) {
return;
}
do {
int bind_n = ZEND_NUM_ARGS() - bind_i,
expected_n = ib_query.in_sqlda ? ib_query.in_sqlda->sqld : 0;
-
+
if (bind_n != expected_n) {
- php_error_docref(NULL TSRMLS_CC, (bind_n < expected_n) ? E_WARNING : E_NOTICE,
+ php_error_docref(NULL, (bind_n < expected_n) ? E_WARNING : E_NOTICE,
"Statement expects %d arguments, %d given", expected_n, bind_n);
if (bind_n < expected_n) {
break;
}
- } else if (bind_n > 0) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &bind_args, &bind_num) == FAILURE) {
+ } else if (bind_n > 0) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &bind_args, &bind_num) == FAILURE) {
return;
}
}
-
- if (FAILURE == _php_ibase_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, &result, &ib_query,
+
+ if (FAILURE == _php_ibase_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, &result, &ib_query,
&bind_args[bind_i])) {
break;
}
if (result != NULL) { /* statement returns a result */
- result->type = QUERY_RESULT;
+ result->type = QUERY_RESULT;
/* EXECUTE PROCEDURE returns only one row => statement can be released immediately */
if (ib_query.statement_type != isc_info_sql_stmt_exec_procedure) {
ib_query.stmt = NULL; /* keep stmt when free query */
}
- ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+ RETVAL_RES(zend_register_resource(result, le_result));
+ Z_TRY_ADDREF_P(return_value);
}
} while (0);
- _php_ibase_free_query(&ib_query TSRMLS_CC);
+ _php_ibase_free_query(&ib_query);
- if (bind_args) {
- efree(bind_args);
- }
}
/* }}} */
@@ -1203,24 +1203,24 @@ PHP_FUNCTION(ibase_affected_rows)
ibase_trans *trans = NULL;
ibase_db_link *ib_link;
zval *arg = NULL;
-
+
RESET_ERRMSG;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &arg) == FAILURE) {
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &arg) == FAILURE) {
return;
}
if (!arg) {
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, IBG(default_link), LE_LINK, le_link, le_plink);
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(IBG(default_link), LE_LINK, le_link, le_plink);
if (ib_link->tr_list == NULL || ib_link->tr_list->trans == NULL) {
RETURN_FALSE;
}
trans = ib_link->tr_list->trans;
} else {
/* one id was passed, could be db or trans id */
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, &arg, &ib_link, &trans);
+ _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, arg, &ib_link, &trans);
if (trans == NULL) {
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, &arg, -1, LE_LINK, le_link, le_plink);
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(arg, LE_LINK, le_link, le_plink);
if (ib_link->tr_list == NULL || ib_link->tr_list->trans == NULL) {
RETURN_FALSE;
@@ -1232,28 +1232,28 @@ PHP_FUNCTION(ibase_affected_rows)
}
/* }}} */
-/* {{{ proto int ibase_num_rows( resource result_identifier )
+/* {{{ proto int ibase_num_rows( resource result_identifier )
Return the number of rows that are available in a result */
#if abies_0
-PHP_FUNCTION(ibase_num_rows)
+PHP_FUNCTION(ibase_num_rows)
{
/**
* As this function relies on the InterBase API function isc_dsql_sql_info()
- * which has a couple of limitations (which I hope will be fixed in future
+ * which has a couple of limitations (which I hope will be fixed in future
* releases of Firebird), this function is fairly useless. I'm leaving it
- * in place for people who can live with the limitations, which I only
+ * in place for people who can live with the limitations, which I only
* found out about after I had implemented it anyway.
*
* Currently, there's no way to determine how many rows can be fetched from
* a cursor. The only number that _can_ be determined is the number of rows
- * that have already been pre-fetched by the client library.
+ * that have already been pre-fetched by the client library.
* This implies the following:
* - num_rows() always returns zero before the first fetch;
* - num_rows() for SELECT ... FOR UPDATE is broken -> never returns a
* higher number than the number of records fetched so far (no pre-fetch);
- * - the result of num_rows() for other statements is merely a lower bound
+ * - the result of num_rows() for other statements is merely a lower bound
* on the number of records => calling ibase_num_rows() again after a couple
- * of fetches will most likely return a new (higher) figure for large result
+ * of fetches will most likely return a new (higher) figure for large result
* sets.
*/
@@ -1264,14 +1264,14 @@ PHP_FUNCTION(ibase_num_rows)
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result_arg) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result_arg) == FAILURE) {
return;
}
- ZEND_FETCH_RESOURCE(ib_result, ibase_result *, &result_arg, -1, LE_RESULT, le_result);
+ ib_result = (ibase_result *)zend_fetch_resource_ex(&result_arg, LE_RESULT, le_result);
if (isc_dsql_sql_info(IB_STATUS, &ib_result->stmt, sizeof(info_count), info_count, sizeof(result), result)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
@@ -1285,29 +1285,29 @@ PHP_FUNCTION(ibase_num_rows)
}
i += len+3;
}
- }
+ }
}
#endif
/* }}} */
static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{ */
- int scale, int flag TSRMLS_DC)
+ int scale, int flag)
{
- static ISC_INT64 const scales[] = { 1, 10, 100, 1000,
- 10000,
- 100000,
- 1000000,
+ static ISC_INT64 const scales[] = { 1, 10, 100, 1000,
+ 10000,
+ 100000,
+ 1000000,
10000000,
- 100000000,
- 1000000000,
- LL_LIT(10000000000),
+ 100000000,
+ 1000000000,
+ LL_LIT(10000000000),
LL_LIT(100000000000),
- LL_LIT(1000000000000),
- LL_LIT(10000000000000),
+ LL_LIT(1000000000000),
+ LL_LIT(10000000000000),
LL_LIT(100000000000000),
LL_LIT(1000000000000000),
- LL_LIT(10000000000000000),
- LL_LIT(100000000000000000),
+ LL_LIT(10000000000000000),
+ LL_LIT(100000000000000000),
LL_LIT(1000000000000000000)
};
@@ -1323,7 +1323,7 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
data = ((IBVARY *) data)->vary_string;
/* no break */
case SQL_TEXT:
- ZVAL_STRINGL(val,(char *) data,len,1);
+ ZVAL_STRINGL(val, (char*)data, len);
break;
case SQL_SHORT:
n = *(short *) data;
@@ -1335,23 +1335,23 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
#else
if (scale == 0) {
l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d", *(ISC_INT64 *) data);
- ZVAL_STRINGL(val,string_data,l,1);
+ ZVAL_STRINGL(val,string_data,l);
} else {
ISC_INT64 n = *(ISC_INT64 *) data, f = scales[-scale];
if (n >= 0) {
l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, n % f);
} else if (n <= -f) {
- l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, -n % f);
+ l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, -n % f);
} else {
l = slprintf(string_data, sizeof(string_data), "-0.%0*" LL_MASK "d", -scale, -n % f);
}
- ZVAL_STRINGL(val,string_data,l,1);
+ ZVAL_STRINGL(val,string_data,l);
}
break;
#endif
case SQL_LONG:
- n = *(ISC_LONG *) data;
+ n = *(ISC_LONG *) data;
_sql_long:
if (scale == 0) {
ZVAL_LONG(val,n);
@@ -1365,7 +1365,7 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
} else {
l = slprintf(string_data, sizeof(string_data), "-0.%0*ld", -scale, -n % f);
}
- ZVAL_STRINGL(val,string_data,l,1);
+ ZVAL_STRINGL(val, string_data, l);
}
break;
case SQL_FLOAT:
@@ -1403,7 +1403,7 @@ format_date_time:
#else
switch (type & ~1) {
default:
- l = slprintf(string_data, sizeof(string_data), "%02d/%02d/%4d %02d:%02d:%02d", t.tm_mon+1, t.tm_mday,
+ l = slprintf(string_data, sizeof(string_data), "%02d/%02d/%4d %02d:%02d:%02d", t.tm_mon+1, t.tm_mday,
t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec);
break;
case SQL_TYPE_DATE:
@@ -1414,7 +1414,7 @@ format_date_time:
break;
}
#endif
- ZVAL_STRINGL(val,string_data,l,1);
+ ZVAL_STRINGL(val, string_data, l);
break;
}
} /* switch (type) */
@@ -1423,12 +1423,12 @@ format_date_time:
/* }}} */
static int _php_ibase_arr_zval(zval *ar_zval, char *data, unsigned long data_size, /* {{{ */
- ibase_array *ib_array, int dim, int flag TSRMLS_DC)
+ ibase_array *ib_array, int dim, int flag)
{
/**
* Create multidimension array - recursion function
*/
- int
+ int
u_bound = ib_array->ar_desc.array_desc_bounds[dim].array_bound_upper,
l_bound = ib_array->ar_desc.array_desc_bounds[dim].array_bound_lower,
dim_len = 1 + u_bound - l_bound;
@@ -1440,22 +1440,21 @@ static int _php_ibase_arr_zval(zval *ar_zval, char *data, unsigned long data_siz
array_init(ar_zval);
for (i = 0; i < dim_len; ++i) {
- zval *slice_zval;
- ALLOC_INIT_ZVAL(slice_zval);
+ zval slice_zval;
/* recursion here */
- if (FAILURE == _php_ibase_arr_zval(slice_zval, data, slice_size, ib_array, dim + 1,
- flag TSRMLS_CC)) {
+ if (FAILURE == _php_ibase_arr_zval(&slice_zval, data, slice_size, ib_array, dim + 1,
+ flag)) {
return FAILURE;
}
data += slice_size;
- add_index_zval(ar_zval,l_bound+i,slice_zval);
+ add_index_zval(ar_zval, l_bound + i, &slice_zval);
}
} else { /* data at last */
if (FAILURE == _php_ibase_var_zval(ar_zval, data, ib_array->el_type,
- ib_array->ar_desc.array_desc_length, ib_array->ar_desc.array_desc_scale, flag TSRMLS_CC)) {
+ ib_array->ar_desc.array_desc_length, ib_array->ar_desc.array_desc_scale, flag)) {
return FAILURE;
}
@@ -1474,16 +1473,17 @@ static int _php_ibase_arr_zval(zval *ar_zval, char *data, unsigned long data_siz
static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type) /* {{{ */
{
zval *result_arg;
- long i, array_cnt = 0, flag = 0;
+ zend_long flag = 0;
+ long i, array_cnt = 0;
ibase_result *ib_result;
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &result_arg, &flag)) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &result_arg, &flag)) {
return;
}
- ZEND_FETCH_RESOURCE(ib_result, ibase_result *, &result_arg, -1, LE_RESULT, le_result);
+ ib_result = (ibase_result *)zend_fetch_resource_ex(result_arg, LE_RESULT, le_result);
if (ib_result->out_sqlda == NULL || !ib_result->has_more_rows) {
RETURN_FALSE;
@@ -1493,38 +1493,38 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
if (isc_dsql_fetch(IB_STATUS, &ib_result->stmt, 1, ib_result->out_sqlda)) {
ib_result->has_more_rows = 0;
if (IB_STATUS[0] && IB_STATUS[1]) { /* error in fetch */
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
}
RETURN_FALSE;
}
} else {
ib_result->has_more_rows = 0;
- }
+ }
array_init(return_value);
for (i = 0; i < ib_result->out_sqlda->sqld; ++i) {
XSQLVAR *var = &ib_result->out_sqlda->sqlvar[i];
char buf[METADATALENGTH+4], *alias = var->aliasname;
-
+
if (! (fetch_type & FETCH_ROW)) {
int i = 0;
char const *base = "FIELD"; /* use 'FIELD' if name is empty */
-
+
/**
- * Ensure no two columns have identical names:
+ * Ensure no two columns have identical names:
* keep generating new names until we find one that is unique.
*/
switch (*alias) {
void *p;
-
+
default:
i = 1;
base = alias;
-
- while (SUCCESS == zend_symtable_find(
- Z_ARRVAL_P(return_value),alias,strlen(alias)+1,&p)) {
-
+
+ while ((p = zend_symtable_str_find_ptr(
+ Z_ARRVAL_P(return_value), alias, strlen(alias))) != NULL) {
+
case '\0':
snprintf(alias = buf, sizeof(buf), "%s_%02d", base, i++);
}
@@ -1532,14 +1532,13 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
}
if (((var->sqltype & 1) == 0) || *var->sqlind != -1) {
- zval *result;
- ALLOC_INIT_ZVAL(result);
+ zval result;
switch (var->sqltype & ~1) {
default:
- _php_ibase_var_zval(result, var->sqldata, var->sqltype, var->sqllen,
- var->sqlscale, flag TSRMLS_CC);
+ _php_ibase_var_zval(&result, var->sqldata, var->sqltype, var->sqllen,
+ var->sqlscale, flag);
break;
case SQL_BLOB:
if (flag & PHP_IBASE_FETCH_BLOBS) { /* fetch blob contents into hash */
@@ -1555,13 +1554,13 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
if (isc_open_blob(IB_STATUS, &ib_result->link->handle, &ib_result->trans->handle,
&blob_handle.bl_handle, &blob_handle.bl_qd)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_fetch_error;
}
if (isc_blob_info(IB_STATUS, &blob_handle.bl_handle, sizeof(bl_items),
bl_items, sizeof(bl_info), bl_info)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_fetch_error;
}
@@ -1570,13 +1569,13 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
unsigned short item_len;
char item = bl_info[i++];
- if (item == isc_info_end || item == isc_info_truncated ||
+ if (item == isc_info_end || item == isc_info_truncated ||
item == isc_info_error || i >= sizeof(bl_info)) {
_php_ibase_module_error("Could not determine BLOB size (internal error)"
- TSRMLS_CC);
+ );
goto _php_ibase_fetch_error;
- }
+ }
item_len = (unsigned short) isc_vax_integer(&bl_info[i], 2);
@@ -1588,20 +1587,21 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
}
if (max_len == 0) {
- ZVAL_STRING(result, "", 1);
- } else if (SUCCESS != _php_ibase_blob_get(result, &blob_handle,
- max_len TSRMLS_CC)) {
+ ZVAL_STRING(&result, "");
+ } else if (SUCCESS != _php_ibase_blob_get(&result, &blob_handle,
+ max_len)) {
goto _php_ibase_fetch_error;
}
if (isc_close_blob(IB_STATUS, &blob_handle.bl_handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
goto _php_ibase_fetch_error;
}
} else { /* blob id only */
+ char *s;
ISC_QUAD bl_qd = *(ISC_QUAD *) var->sqldata;
- ZVAL_STRINGL(result,_php_ibase_quad_to_string(bl_qd), BLOB_ID_LEN, 0);
+ ZVAL_NEW_STR(&result, _php_ibase_quad_to_string(bl_qd));
}
break;
case SQL_ARRAY:
@@ -1610,16 +1610,16 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
ibase_array *ib_array = &ib_result->out_array[array_cnt++];
void *ar_data = emalloc(ib_array->ar_size);
- if (isc_array_get_slice(IB_STATUS, &ib_result->link->handle,
+ if (isc_array_get_slice(IB_STATUS, &ib_result->link->handle,
&ib_result->trans->handle, &ar_qd, &ib_array->ar_desc,
ar_data, &ib_array->ar_size)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
efree(ar_data);
goto _php_ibase_fetch_error;
}
- if (FAILURE == _php_ibase_arr_zval(result, ar_data, ib_array->ar_size, ib_array,
- 0, flag TSRMLS_CC)) {
+ if (FAILURE == _php_ibase_arr_zval(&result, ar_data, ib_array->ar_size, ib_array,
+ 0, flag)) {
efree(ar_data);
goto _php_ibase_fetch_error;
}
@@ -1627,19 +1627,18 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
} else { /* blob id only */
ISC_QUAD ar_qd = *(ISC_QUAD *) var->sqldata;
- ZVAL_STRINGL(result,_php_ibase_quad_to_string(ar_qd), BLOB_ID_LEN, 0);
+ ZVAL_NEW_STR(&result, _php_ibase_quad_to_string(ar_qd));
}
break;
_php_ibase_fetch_error:
- zval_dtor(result);
- FREE_ZVAL(result);
+ zval_dtor(&result);
RETURN_FALSE;
} /* switch */
if (fetch_type & FETCH_ROW) {
- add_index_zval(return_value, i, result);
+ add_index_zval(return_value, i, &result);
} else {
- add_assoc_zval(return_value, alias, result);
+ add_assoc_zval(return_value, alias, &result);
}
} else {
if (fetch_type & FETCH_ROW) {
@@ -1675,7 +1674,7 @@ PHP_FUNCTION(ibase_fetch_object)
_php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FETCH_ARRAY);
if (Z_TYPE_P(return_value) == IS_ARRAY) {
- object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
+ convert_to_object(return_value);
}
}
/* }}} */
@@ -1687,19 +1686,19 @@ PHP_FUNCTION(ibase_name_result)
{
zval *result_arg;
char *name_arg;
- int name_arg_len;
+ size_t name_arg_len;
ibase_result *ib_result;
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &result_arg, &name_arg, &name_arg_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &result_arg, &name_arg, &name_arg_len) == FAILURE) {
return;
}
- ZEND_FETCH_RESOURCE(ib_result, ibase_result *, &result_arg, -1, LE_RESULT, le_result);
+ ib_result = (ibase_result *)zend_fetch_resource_ex(result_arg, LE_RESULT, le_result);
if (isc_dsql_set_cursor_name(IB_STATUS, &ib_result->stmt, name_arg, 0)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
RETURN_TRUE;
@@ -1716,12 +1715,12 @@ PHP_FUNCTION(ibase_free_result)
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result_arg) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result_arg) == FAILURE) {
return;
}
- ZEND_FETCH_RESOURCE(ib_result, ibase_result *, &result_arg, -1, LE_RESULT, le_result);
- zend_list_delete(Z_RESVAL_P(result_arg));
+ ib_result = (ibase_result *)zend_fetch_resource_ex(result_arg, LE_RESULT, le_result);
+ zend_list_delete(Z_RES_P(result_arg));
RETURN_TRUE;
}
/* }}} */
@@ -1733,46 +1732,47 @@ PHP_FUNCTION(ibase_prepare)
zval *link_arg, *trans_arg;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
- int query_len, trans_res_id = 0;
+ size_t query_len, trans_res_id = 0;
ibase_query *ib_query;
char *query;
RESET_ERRMSG;
-
+
if (ZEND_NUM_ARGS() == 1) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &query, &query_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &query, &query_len) == FAILURE) {
return;
}
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, IBG(default_link), LE_LINK, le_link, le_plink);
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(IBG(default_link), LE_LINK, le_link, le_plink);
} else if (ZEND_NUM_ARGS() == 2) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &link_arg, &query, &query_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &link_arg, &query, &query_len) == FAILURE) {
return;
}
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, &link_arg, &ib_link, &trans);
+ _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, link_arg, &ib_link, &trans);
if (trans != NULL) {
- trans_res_id = Z_RESVAL_P(link_arg);
+ trans_res_id = Z_RES_P(link_arg)->handle;
}
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrs", &link_arg, &trans_arg, &query, &query_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrs", &link_arg, &trans_arg, &query, &query_len) == FAILURE) {
return;
}
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, &link_arg, -1, LE_LINK, le_link, le_plink);
- ZEND_FETCH_RESOURCE(trans, ibase_trans *, &trans_arg, -1, LE_TRANS, le_trans);
- trans_res_id = Z_RESVAL_P(trans_arg);
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(link_arg, LE_LINK, le_link, le_plink);
+ trans = (ibase_trans *)zend_fetch_resource_ex(trans_arg, LE_TRANS, le_trans);
+ trans_res_id = Z_RES_P(trans_arg)->handle;
}
- if (FAILURE == _php_ibase_def_trans(ib_link, &trans TSRMLS_CC)) {
+ if (FAILURE == _php_ibase_def_trans(ib_link, &trans)) {
RETURN_FALSE;
}
ib_query = (ibase_query *) emalloc(sizeof(ibase_query));
- if (FAILURE == _php_ibase_alloc_query(ib_query, ib_link, trans, query, ib_link->dialect, trans_res_id TSRMLS_CC)) {
+ if (FAILURE == _php_ibase_alloc_query(ib_query, ib_link, trans, query, ib_link->dialect, trans_res_id)) {
efree(ib_query);
RETURN_FALSE;
}
- ZEND_REGISTER_RESOURCE(return_value, ib_query, le_query);
+ RETVAL_RES(zend_register_resource(ib_query, le_query));
+ Z_TRY_ADDREF_P(return_value);
}
/* }}} */
@@ -1780,27 +1780,26 @@ PHP_FUNCTION(ibase_prepare)
Execute a previously prepared query */
PHP_FUNCTION(ibase_execute)
{
- zval *query, ***args = NULL;
+ zval *query, *args = NULL;
ibase_query *ib_query;
ibase_result *result = NULL;
- ALLOCA_FLAG(use_heap)
+ int bind_n = 0;
RESET_ERRMSG;
-
+
RETVAL_FALSE;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() ? 1 : 0 TSRMLS_CC, "r", &query)) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "|r*", &query, &args, &bind_n)) {
return;
}
- ZEND_FETCH_RESOURCE(ib_query, ibase_query *, &query, -1, LE_QUERY, le_query);
+ ib_query = (ibase_query *)zend_fetch_resource_ex(query, LE_QUERY, le_query);
do {
- int bind_n = ZEND_NUM_ARGS() - 1,
- expected_n = ib_query->in_sqlda ? ib_query->in_sqlda->sqld : 0;
+ int expected_n = ib_query->in_sqlda ? ib_query->in_sqlda->sqld : 0;
if (bind_n != expected_n) {
- php_error_docref(NULL TSRMLS_CC, (bind_n < expected_n) ? E_WARNING : E_NOTICE,
+ php_error_docref(NULL, (bind_n < expected_n) ? E_WARNING : E_NOTICE,
"Statement expects %d arguments, %d given", expected_n, bind_n);
if (bind_n < expected_n) {
@@ -1808,49 +1807,49 @@ PHP_FUNCTION(ibase_execute)
}
}
- /* have variables to bind */
- args = (zval ***) do_alloca((expected_n + 1) * sizeof(zval **), use_heap);
-
- if (FAILURE == zend_get_parameters_array_ex((expected_n + 1), args)) {
- break;
- }
-
/* Have we used this cursor before and it's still open (exec proc has no cursor) ? */
- if (ib_query->result_res_id != 0
+ if (ib_query->result_res_id != 0
&& ib_query->statement_type != isc_info_sql_stmt_exec_procedure) {
+ zval *res;
+
IBDEBUG("Implicitly closing a cursor");
if (isc_dsql_free_statement(IB_STATUS, &ib_query->stmt, DSQL_close)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
break;
}
/* invalidate previous results returned by this query (not necessary for exec proc) */
- zend_list_delete(ib_query->result_res_id);
+ res = zend_hash_index_find(&EG(regular_list), ib_query->result_res_id);
+ if (res) {
+ zend_list_delete(Z_RES_P(res));
+ }
}
- if (FAILURE == _php_ibase_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, &result, ib_query,
- &args[1])) {
+ if (FAILURE == _php_ibase_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, &result, ib_query,
+ args)) {
break;
}
/* free the query if trans handle was released */
if (ib_query->trans->handle == NULL) {
- zend_list_delete(Z_LVAL_P(query));
+ zend_list_delete(Z_RES_P(query));
}
-
+
if (result != NULL) {
+ zval *ret;
+
result->type = EXECUTE_RESULT;
if (ib_query->statement_type == isc_info_sql_stmt_exec_procedure) {
result->stmt = NULL;
}
- ib_query->result_res_id = zend_list_insert(result, le_result TSRMLS_CC);
- RETVAL_RESOURCE(ib_query->result_res_id);
+
+ ret = zend_list_insert(result, le_result);
+ ib_query->result_res_id = Z_RES_HANDLE_P(ret);
+ ZVAL_COPY_VALUE(return_value, ret);
+ Z_TRY_ADDREF_P(return_value);
+ Z_TRY_ADDREF_P(return_value);
}
} while (0);
-
- if (args) {
- free_alloca(args, use_heap);
- }
}
/* }}} */
@@ -1863,12 +1862,12 @@ PHP_FUNCTION(ibase_free_query)
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &query_arg) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &query_arg) == FAILURE) {
return;
}
- ZEND_FETCH_RESOURCE(ib_query, ibase_query *, &query_arg, -1, LE_QUERY, le_query);
- zend_list_delete(Z_RESVAL_P(query_arg));
+ ib_query = (ibase_query *)zend_fetch_resource_ex(query_arg, LE_QUERY, le_query);
+ zend_list_close(Z_RES_P(query_arg));
RETURN_TRUE;
}
/* }}} */
@@ -1883,21 +1882,21 @@ PHP_FUNCTION(ibase_num_fields)
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result) == FAILURE) {
return;
}
- zend_list_find(Z_RESVAL_P(result), &type);
+ type = Z_RES_P(result)->type;
if (type == le_query) {
ibase_query *ib_query;
-
- ZEND_FETCH_RESOURCE(ib_query, ibase_query *, &result, -1, LE_QUERY, le_query);
+
+ ib_query = (ibase_query *)zend_fetch_resource_ex(result, LE_QUERY, le_query);
sqlda = ib_query->out_sqlda;
} else {
ibase_result *ib_result;
- ZEND_FETCH_RESOURCE(ib_result, ibase_result *, &result, -1, LE_RESULT, le_result);
+ ib_result = (ibase_result *)zend_fetch_resource_ex(result, LE_RESULT, le_result);
sqlda = ib_result->out_sqlda;
}
@@ -1916,18 +1915,18 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
array_init(return_value);
- add_index_stringl(return_value, 0, var->sqlname, var->sqlname_length, 1);
- add_assoc_stringl(return_value, "name", var->sqlname, var->sqlname_length, 1);
+ add_index_stringl(return_value, 0, var->sqlname, var->sqlname_length);
+ add_assoc_stringl(return_value, "name", var->sqlname, var->sqlname_length);
- add_index_stringl(return_value, 1, var->aliasname, var->aliasname_length, 1);
- add_assoc_stringl(return_value, "alias", var->aliasname, var->aliasname_length, 1);
+ add_index_stringl(return_value, 1, var->aliasname, var->aliasname_length);
+ add_assoc_stringl(return_value, "alias", var->aliasname, var->aliasname_length);
- add_index_stringl(return_value, 2, var->relname, var->relname_length, 1);
- add_assoc_stringl(return_value, "relation", var->relname, var->relname_length, 1);
+ add_index_stringl(return_value, 2, var->relname, var->relname_length);
+ add_assoc_stringl(return_value, "relation", var->relname, var->relname_length);
len = slprintf(buf, 16, "%d", var->sqllen);
- add_index_stringl(return_value, 3, buf, len, 1);
- add_assoc_stringl(return_value, "length", buf, len, 1);
+ add_index_stringl(return_value, 3, buf, len);
+ add_assoc_stringl(return_value, "length", buf, len);
if (var->sqlscale < 0) {
unsigned short precision = 0;
@@ -1945,41 +1944,41 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
break;
}
len = slprintf(buf, 16, "NUMERIC(%d,%d)", precision, -var->sqlscale);
- add_index_stringl(return_value, 4, s, len, 1);
- add_assoc_stringl(return_value, "type", s, len, 1);
+ add_index_stringl(return_value, 4, s, len);
+ add_assoc_stringl(return_value, "type", s, len);
} else {
switch (var->sqltype & ~1) {
case SQL_TEXT:
- s = "CHAR";
+ s = "CHAR";
break;
case SQL_VARYING:
- s = "VARCHAR";
+ s = "VARCHAR";
break;
case SQL_SHORT:
- s = "SMALLINT";
+ s = "SMALLINT";
break;
case SQL_LONG:
- s = "INTEGER";
+ s = "INTEGER";
break;
case SQL_FLOAT:
s = "FLOAT"; break;
case SQL_DOUBLE:
case SQL_D_FLOAT:
s = "DOUBLE PRECISION"; break;
- case SQL_INT64:
- s = "BIGINT";
+ case SQL_INT64:
+ s = "BIGINT";
break;
- case SQL_TIMESTAMP:
- s = "TIMESTAMP";
+ case SQL_TIMESTAMP:
+ s = "TIMESTAMP";
break;
case SQL_TYPE_DATE:
s = "DATE";
break;
case SQL_TYPE_TIME:
- s = "TIME";
+ s = "TIME";
break;
case SQL_BLOB:
- s = "BLOB";
+ s = "BLOB";
break;
case SQL_ARRAY:
s = "ARRAY";
@@ -1990,8 +1989,8 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
s = "QUAD";
break;
}
- add_index_string(return_value, 4, s, 1);
- add_assoc_string(return_value, "type", s, 1);
+ add_index_string(return_value, 4, s);
+ add_assoc_string(return_value, "type", s);
}
}
/* }}} */
@@ -2001,32 +2000,32 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
PHP_FUNCTION(ibase_field_info)
{
zval *result_arg;
- long field_arg;
+ zend_long field_arg;
int type;
XSQLDA *sqlda;
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result_arg, &field_arg) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &result_arg, &field_arg) == FAILURE) {
return;
}
- zend_list_find(Z_RESVAL_P(result_arg), &type);
+ type = Z_RES_P(result_arg)->type;
if (type == le_query) {
ibase_query *ib_query;
- ZEND_FETCH_RESOURCE(ib_query, ibase_query *, &result_arg, -1, LE_QUERY, le_query);
+ ib_query= (ibase_query *)zend_fetch_resource_ex(result_arg, LE_QUERY, le_query);
sqlda = ib_query->out_sqlda;
} else {
ibase_result *ib_result;
- ZEND_FETCH_RESOURCE(ib_result, ibase_result *, &result_arg, -1, LE_RESULT, le_result);
+ ib_result = (ibase_result *)zend_fetch_resource_ex(result_arg, LE_RESULT, le_result);
sqlda = ib_result->out_sqlda;
- }
+ }
if (sqlda == NULL) {
- _php_ibase_module_error("Trying to get field info from a non-select query" TSRMLS_CC);
+ _php_ibase_module_error("Trying to get field info from a non-select query");
RETURN_FALSE;
}
@@ -2046,11 +2045,11 @@ PHP_FUNCTION(ibase_num_params)
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result) == FAILURE) {
return;
}
- ZEND_FETCH_RESOURCE(ib_query, ibase_query *, &result, -1, LE_QUERY, le_query);
+ ib_query = (ibase_query *)zend_fetch_resource_ex(result, LE_QUERY, le_query);
if (ib_query->in_sqlda == NULL) {
RETURN_LONG(0);
@@ -2065,16 +2064,16 @@ PHP_FUNCTION(ibase_num_params)
PHP_FUNCTION(ibase_param_info)
{
zval *result_arg;
- long field_arg;
+ zend_long field_arg;
ibase_query *ib_query;
RESET_ERRMSG;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result_arg, &field_arg) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &result_arg, &field_arg) == FAILURE) {
return;
}
- ZEND_FETCH_RESOURCE(ib_query, ibase_query *, &result_arg, -1, LE_QUERY, le_query);
+ ib_query = (ibase_query *)zend_fetch_resource_ex(result_arg, LE_QUERY, le_query);
if (ib_query->in_sqlda == NULL) {
RETURN_FALSE;
diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c
index e041348da8..c1b1268cd0 100644
--- a/ext/interbase/ibase_service.c
+++ b/ext/interbase/ibase_service.c
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+
@@ -31,17 +31,17 @@ typedef struct {
isc_svc_handle handle;
char *hostname;
char *username;
- long res_id;
+ zend_resource *res;
} ibase_service;
static int le_service;
-static void _php_ibase_free_service(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _php_ibase_free_service(zend_resource *rsrc) /* {{{ */
{
ibase_service *sv = (ibase_service *) rsrc->ptr;
if (isc_service_detach(IB_STATUS, &sv->handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
}
if (sv->hostname) {
@@ -55,15 +55,15 @@ static void _php_ibase_free_service(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{
}
/* }}} */
-/* the svc api seems to get confused after an error has occurred,
+/* the svc api seems to get confused after an error has occurred,
so invalidate the handle on errors */
#define IBASE_SVC_ERROR(svm) \
- do { zend_list_delete(svm->res_id); _php_ibase_error(TSRMLS_C); } while (0)
-
+ do { zend_list_delete(svm->res); _php_ibase_error(); } while (0)
+
void php_ibase_service_minit(INIT_FUNC_ARGS) /* {{{ */
{
- le_service = zend_register_list_destructors_ex(_php_ibase_free_service, NULL,
+ le_service = zend_register_list_destructors_ex(_php_ibase_free_service, NULL,
"interbase service manager handle", module_number);
/* backup options */
@@ -134,7 +134,7 @@ void php_ibase_service_minit(INIT_FUNC_ARGS) /* {{{ */
static void _php_ibase_user(INTERNAL_FUNCTION_PARAMETERS, char operation) /* {{{ */
{
/* user = 0, password = 1, first_name = 2, middle_name = 3, last_name = 4 */
- static char const user_flags[] = { isc_spb_sec_username, isc_spb_sec_password,
+ static char const user_flags[] = { isc_spb_sec_username, isc_spb_sec_password,
isc_spb_sec_firstname, isc_spb_sec_middlename, isc_spb_sec_lastname };
char buf[128], *args[] = { NULL, NULL, NULL, NULL, NULL };
int i, args_len[] = { 0, 0, 0, 0, 0 };
@@ -144,26 +144,25 @@ static void _php_ibase_user(INTERNAL_FUNCTION_PARAMETERS, char operation) /* {{{
RESET_ERRMSG;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
(operation == isc_action_svc_delete_user) ? "rs" : "rss|sss",
&res, &args[0], &args_len[0], &args[1], &args_len[1], &args[2], &args_len[2],
&args[3], &args_len[3], &args[4], &args_len[4])) {
RETURN_FALSE;
}
-
- ZEND_FETCH_RESOURCE(svm, ibase_service *, &res, -1, "Interbase service manager handle",
+
+ svm = (ibase_service *)zend_fetch_resource_ex(res, "Interbase service manager handle",
le_service);
buf[0] = operation;
-
+
for (i = 0; i < sizeof(user_flags); ++i) {
if (args[i] != NULL) {
int chunk = slprintf(&buf[spb_len], sizeof(buf) - spb_len, "%c%c%c%s",
user_flags[i], (char)args_len[i], (char)(args_len[i] >> 8), args[i]);
-
+
if ((spb_len + chunk) > sizeof(buf) || chunk <= 0) {
- _php_ibase_module_error("Internal error: insufficient buffer space for SPB (%d)"
- TSRMLS_CC, spb_len);
+ _php_ibase_module_error("Internal error: insufficient buffer space for SPB (%d)", spb_len);
RETURN_FALSE;
}
spb_len += chunk;
@@ -208,14 +207,14 @@ PHP_FUNCTION(ibase_delete_user)
Connect to the service manager */
PHP_FUNCTION(ibase_service_attach)
{
- int hlen, ulen, plen, spb_len;
+ size_t hlen, ulen, plen, spb_len;
ibase_service *svm;
char buf[128], *host, *user, *pass, *loc;
isc_svc_handle handle = NULL;
RESET_ERRMSG;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss",
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "sss",
&host, &hlen, &user, &ulen, &pass, &plen)) {
RETURN_FALSE;
@@ -227,7 +226,7 @@ PHP_FUNCTION(ibase_service_attach)
user, isc_spb_password, (char)plen, pass, host);
if (spb_len > sizeof(buf) || spb_len == -1) {
- _php_ibase_module_error("Internal error: insufficient buffer space for SPB (%d)" TSRMLS_CC, spb_len);
+ _php_ibase_module_error("Internal error: insufficient buffer space for SPB (%d)", spb_len);
RETURN_FALSE;
}
@@ -236,7 +235,7 @@ PHP_FUNCTION(ibase_service_attach)
/* attach to the service manager */
if (isc_service_attach(IB_STATUS, 0, loc, &handle, (unsigned short)spb_len, buf)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
@@ -245,8 +244,9 @@ PHP_FUNCTION(ibase_service_attach)
svm->hostname = estrdup(host);
svm->username = estrdup(user);
- ZEND_REGISTER_RESOURCE(return_value, svm, le_service);
- svm->res_id = Z_LVAL_P(return_value);
+ RETVAL_RES(zend_register_resource(svm, le_service));
+ Z_TRY_ADDREF_P(return_value);
+ svm->res = Z_RES_P(return_value);
}
/* }}} */
@@ -258,11 +258,11 @@ PHP_FUNCTION(ibase_service_detach)
RESET_ERRMSG;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "r", &res)) {
RETURN_FALSE;
}
- zend_list_delete(Z_LVAL_P(res));
+ zend_list_delete(Z_RES_P(res));
RETURN_TRUE;
}
@@ -304,7 +304,9 @@ query_loop:
if (! (line_len = isc_vax_integer(result, 2))) {
/* done */
if (heap_buf) {
- RETURN_STRING(heap_buf,0);
+ RETVAL_STRING(heap_buf);
+ efree(heap_buf);
+ return;
} else {
RETURN_TRUE;
}
@@ -330,7 +332,7 @@ query_loop:
case isc_info_svc_get_env_lock:
case isc_info_svc_get_env_msg:
case isc_info_svc_user_dbpath:
- RETURN_STRINGL(result + 2, isc_vax_integer(result, 2), 1);
+ RETURN_STRINGL(result + 2, isc_vax_integer(result, 2));
case isc_info_svc_svr_db_info:
array_init(return_value);
@@ -351,14 +353,14 @@ query_loop:
case isc_spb_dbname:
len = isc_vax_integer(result,2);
- add_next_index_stringl(return_value, result +2, len, 1);
+ add_next_index_stringl(return_value, result +2, len);
result += len+2;
}
} while (*result != isc_info_flag_end);
return;
case isc_info_svc_get_users: {
- zval *user;
+ zval user;
array_init(return_value);
while (*result != isc_info_end) {
@@ -368,40 +370,39 @@ query_loop:
case isc_spb_sec_username:
/* it appears that the username is always first */
- ALLOC_INIT_ZVAL(user);
- array_init(user);
- add_next_index_zval(return_value, user);
+ array_init(&user);
+ add_next_index_zval(return_value, &user);
len = isc_vax_integer(result,2);
- add_assoc_stringl(user, "user_name", result +2, len, 1);
+ add_assoc_stringl(&user, "user_name", result +2, len);
result += len+2;
break;
case isc_spb_sec_firstname:
len = isc_vax_integer(result,2);
- add_assoc_stringl(user, "first_name", result +2, len, 1);
+ add_assoc_stringl(&user, "first_name", result +2, len);
result += len+2;
break;
case isc_spb_sec_middlename:
len = isc_vax_integer(result,2);
- add_assoc_stringl(user, "middle_name", result +2, len, 1);
+ add_assoc_stringl(&user, "middle_name", result +2, len);
result += len+2;
break;
case isc_spb_sec_lastname:
len = isc_vax_integer(result,2);
- add_assoc_stringl(user, "last_name", result +2, len, 1);
+ add_assoc_stringl(&user, "last_name", result +2, len);
result += len+2;
break;
case isc_spb_sec_userid:
- add_assoc_long(user, "user_id", isc_vax_integer(result, 4));
+ add_assoc_long(&user, "user_id", isc_vax_integer(result, 4));
result += 4;
break;
case isc_spb_sec_groupid:
- add_assoc_long(user, "group_id", isc_vax_integer(result, 4));
+ add_assoc_long(&user, "group_id", isc_vax_integer(result, 4));
result += 4;
break;
}
@@ -423,19 +424,19 @@ static void _php_ibase_backup_restore(INTERNAL_FUNCTION_PARAMETERS, char operati
*/
zval *res;
char *db, *bk, buf[200];
- int dblen, bklen, spb_len;
- long opts = 0;
+ size_t dblen, bklen, spb_len;
+ zend_long opts = 0;
zend_bool verbose = 0;
ibase_service *svm;
RESET_ERRMSG;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|lb",
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "rss|lb",
&res, &db, &dblen, &bk, &bklen, &opts, &verbose)) {
RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE(svm, ibase_service *, &res, -1,
+ svm = (ibase_service *)zend_fetch_resource_ex(res,
"Interbase service manager handle", le_service);
/* fill the param buffer */
@@ -449,7 +450,7 @@ static void _php_ibase_backup_restore(INTERNAL_FUNCTION_PARAMETERS, char operati
}
if (spb_len > sizeof(buf) || spb_len <= 0) {
- _php_ibase_module_error("Internal error: insufficient buffer space for SPB (%d)" TSRMLS_CC, spb_len);
+ _php_ibase_module_error("Internal error: insufficient buffer space for SPB (%d)", spb_len);
RETURN_FALSE;
}
@@ -487,18 +488,19 @@ static void _php_ibase_service_action(INTERNAL_FUNCTION_PARAMETERS, char svc_act
{
zval *res;
char buf[128], *db;
- int dblen, spb_len;
- long action, argument = 0;
+ size_t dblen;
+ int spb_len;
+ zend_long action, argument = 0;
ibase_service *svm;
RESET_ERRMSG;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsl|l",
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "rsl|l",
&res, &db, &dblen, &action, &argument)) {
RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE(svm, ibase_service *, &res, -1,
+ svm = (ibase_service *)zend_fetch_resource_ex(res,
"Interbase service manager handle", le_service);
if (svc_action == isc_action_svc_db_stats) {
@@ -518,7 +520,7 @@ static void _php_ibase_service_action(INTERNAL_FUNCTION_PARAMETERS, char svc_act
switch (action) {
default:
unknown_option:
- _php_ibase_module_error("Unrecognised option (%ld)" TSRMLS_CC, action);
+ _php_ibase_module_error("Unrecognised option (%ld)", action);
RETURN_FALSE;
case isc_spb_rpr_check_db:
@@ -557,7 +559,7 @@ options_argument:
}
if (spb_len > sizeof(buf) || spb_len == -1) {
- _php_ibase_module_error("Internal error: insufficient buffer space for SPB (%d)" TSRMLS_CC, spb_len);
+ _php_ibase_module_error("Internal error: insufficient buffer space for SPB (%d)", spb_len);
RETURN_FALSE;
}
@@ -595,16 +597,16 @@ PHP_FUNCTION(ibase_db_info)
PHP_FUNCTION(ibase_server_info)
{
zval *res;
- long action;
+ zend_long action;
ibase_service *svm;
RESET_ERRMSG;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &res, &action)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &res, &action)) {
RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE(svm, ibase_service *, &res, -1,
+ svm = (ibase_service *)zend_fetch_resource_ex(res,
"Interbase service manager handle", le_service);
_php_ibase_service_query(INTERNAL_FUNCTION_PARAM_PASSTHRU, svm, (char)action);
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index eac247b97a..1eece4c000 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+
@@ -41,7 +41,7 @@
#define COMMIT 1
#define RETAIN 2
-#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "A link to the server could not be established"); RETURN_FALSE; } }
+#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL, E_WARNING, "A link to the server could not be established"); RETURN_FALSE; } }
ZEND_DECLARE_MODULE_GLOBALS(ibase)
static PHP_GINIT_FUNCTION(ibase);
@@ -451,7 +451,7 @@ zend_module_entry ibase_module_entry = {
NULL,
PHP_RSHUTDOWN(ibase),
PHP_MINFO(ibase),
- NO_VERSION_YET,
+ PHP_INTERBASE_VERSION,
PHP_MODULE_GLOBALS(ibase),
PHP_GINIT(ibase),
NULL,
@@ -470,7 +470,7 @@ int le_link, le_plink, le_trans;
/* error handling ---------------------------- */
-/* {{{ proto string ibase_errmsg(void)
+/* {{{ proto string ibase_errmsg(void)
Return error message */
PHP_FUNCTION(ibase_errmsg)
{
@@ -479,14 +479,14 @@ PHP_FUNCTION(ibase_errmsg)
}
if (IBG(sql_code) != 0) {
- RETURN_STRING(IBG(errmsg), 1);
+ RETURN_STRING(IBG(errmsg));
}
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto int ibase_errcode(void)
+/* {{{ proto int ibase_errcode(void)
Return error code */
PHP_FUNCTION(ibase_errcode)
{
@@ -502,32 +502,28 @@ PHP_FUNCTION(ibase_errcode)
/* }}} */
/* print interbase error and save it for ibase_errmsg() */
-void _php_ibase_error(TSRMLS_D) /* {{{ */
+void _php_ibase_error(void) /* {{{ */
{
char *s = IBG(errmsg);
- ISC_STATUS *statusp = IB_STATUS;
+ const ISC_STATUS *statusp = IB_STATUS;
IBG(sql_code) = isc_sqlcode(IB_STATUS);
-
- while ((s - IBG(errmsg)) < MAX_ERRMSG - (IBASE_MSGSIZE + 2) && isc_interprete(s, &statusp)) {
+
+ while ((s - IBG(errmsg)) < MAX_ERRMSG - (IBASE_MSGSIZE + 2) && fb_interpret(s, MAX_ERRMSG, &statusp)) {
strcat(IBG(errmsg), " ");
s = IBG(errmsg) + strlen(IBG(errmsg));
}
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", IBG(errmsg));
+ php_error_docref(NULL, E_WARNING, "%s", IBG(errmsg));
}
/* }}} */
/* print php interbase module error and save it for ibase_errmsg() */
-void _php_ibase_module_error(char *msg TSRMLS_DC, ...) /* {{{ */
+void _php_ibase_module_error(char *msg, ...) /* {{{ */
{
va_list ap;
-#ifdef ZTS
- va_start(ap, TSRMLS_C);
-#else
va_start(ap, msg);
-#endif
/* vsnprintf NUL terminates the buf and writes at most n-1 chars+NUL */
vsnprintf(IBG(errmsg), MAX_ERRMSG, msg, ap);
@@ -535,7 +531,7 @@ void _php_ibase_module_error(char *msg TSRMLS_DC, ...) /* {{{ */
IBG(sql_code) = -999; /* no SQL error */
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", IBG(errmsg));
+ php_error_docref(NULL, E_WARNING, "%s", IBG(errmsg));
}
/* }}} */
@@ -550,36 +546,32 @@ typedef struct {
/* Fill ib_link and trans with the correct database link and transaction. */
void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, /* {{{ */
- zval **link_id, ibase_db_link **ib_link, ibase_trans **trans)
+ zval *link_id, ibase_db_link **ib_link, ibase_trans **trans)
{
- int type;
-
IBDEBUG("Transaction or database link?");
- if (zend_list_find(Z_LVAL_PP(link_id), &type)) {
- if (type == le_trans) {
- /* Transaction resource: make sure it refers to one link only, then
- fetch it; database link is stored in ib_trans->db_link[]. */
- IBDEBUG("Type is le_trans");
- ZEND_FETCH_RESOURCE(*trans, ibase_trans *, link_id, -1, LE_TRANS, le_trans);
- if ((*trans)->link_cnt > 1) {
- _php_ibase_module_error("Link id is ambiguous: transaction spans multiple connections."
- TSRMLS_CC);
- return;
- }
- *ib_link = (*trans)->db_link[0];
+ if (Z_RES_P(link_id)->type == le_trans) {
+ /* Transaction resource: make sure it refers to one link only, then
+ fetch it; database link is stored in ib_trans->db_link[]. */
+ IBDEBUG("Type is le_trans");
+ *trans = (ibase_trans *)zend_fetch_resource_ex(link_id, LE_TRANS, le_trans);
+ if ((*trans)->link_cnt > 1) {
+ _php_ibase_module_error("Link id is ambiguous: transaction spans multiple connections."
+ );
return;
}
- }
+ *ib_link = (*trans)->db_link[0];
+ return;
+ }
IBDEBUG("Type is le_[p]link or id not found");
/* Database link resource, use default transaction. */
*trans = NULL;
- ZEND_FETCH_RESOURCE2(*ib_link, ibase_db_link *, link_id, -1, LE_LINK, le_link, le_plink);
+ *ib_link = (ibase_db_link *)zend_fetch_resource2_ex(link_id, LE_LINK, le_link, le_plink);
}
-/* }}} */
+/* }}} */
/* destructors ---------------------- */
-static void _php_ibase_commit_link(ibase_db_link *link TSRMLS_DC) /* {{{ */
+static void _php_ibase_commit_link(ibase_db_link *link) /* {{{ */
{
unsigned short i = 0, j;
ibase_tr_list *l;
@@ -593,16 +585,16 @@ static void _php_ibase_commit_link(ibase_db_link *link TSRMLS_DC) /* {{{ */
if (p->trans->handle != NULL) {
IBDEBUG("Committing default transaction...");
if (isc_commit_transaction(IB_STATUS, &p->trans->handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
}
}
efree(p->trans); /* default transaction is not a registered resource: clean up */
} else {
- if (p->trans->handle != NULL) {
+ if (p->trans->handle != NULL) {
/* non-default trans might have been rolled back by other call of this dtor */
IBDEBUG("Rolling back other transactions...");
if (isc_rollback_transaction(IB_STATUS, &p->trans->handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
}
}
/* set this link pointer to NULL in the transaction */
@@ -618,28 +610,28 @@ static void _php_ibase_commit_link(ibase_db_link *link TSRMLS_DC) /* {{{ */
efree(p);
}
link->tr_list = NULL;
-
+
for (e = link->event_head; e; e = e->event_next) {
- _php_ibase_free_event(e TSRMLS_CC);
+ _php_ibase_free_event(e);
e->link = NULL;
}
}
/* }}} */
-static void php_ibase_commit_link_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void php_ibase_commit_link_rsrc(zend_resource *rsrc) /* {{{ */
{
ibase_db_link *link = (ibase_db_link *) rsrc->ptr;
- _php_ibase_commit_link(link TSRMLS_CC);
+ _php_ibase_commit_link(link);
}
/* }}} */
-static void _php_ibase_close_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _php_ibase_close_link(zend_resource *rsrc) /* {{{ */
{
ibase_db_link *link = (ibase_db_link *) rsrc->ptr;
- _php_ibase_commit_link(link TSRMLS_CC);
+ _php_ibase_commit_link(link);
if (link->handle != NULL) {
IBDEBUG("Closing normal link...");
isc_detach_database(IB_STATUS, &link->handle);
@@ -649,11 +641,11 @@ static void _php_ibase_close_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ *
}
/* }}} */
-static void _php_ibase_close_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _php_ibase_close_plink(zend_resource *rsrc) /* {{{ */
{
ibase_db_link *link = (ibase_db_link *) rsrc->ptr;
- _php_ibase_commit_link(link TSRMLS_CC);
+ _php_ibase_commit_link(link);
IBDEBUG("Closing permanent link...");
if (link->handle != NULL) {
isc_detach_database(IB_STATUS, &link->handle);
@@ -664,16 +656,16 @@ static void _php_ibase_close_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{
}
/* }}} */
-static void _php_ibase_free_trans(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+static void _php_ibase_free_trans(zend_resource *rsrc) /* {{{ */
{
ibase_trans *trans = (ibase_trans *)rsrc->ptr;
unsigned short i;
-
+
IBDEBUG("Cleaning up transaction resource...");
if (trans->handle != NULL) {
IBDEBUG("Rolling back unhandled transaction...");
if (isc_rollback_transaction(IB_STATUS, &trans->handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
}
}
@@ -698,9 +690,8 @@ static void _php_ibase_free_trans(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ *
/* TODO this function should be part of either Zend or PHP API */
static PHP_INI_DISP(php_ibase_password_displayer_cb)
{
- TSRMLS_FETCH();
- if ((type == PHP_INI_DISPLAY_ORIG && ini_entry->orig_value)
+ if ((type == PHP_INI_DISPLAY_ORIG && ini_entry->orig_value)
|| (type == PHP_INI_DISPLAY_ACTIVE && ini_entry->value)) {
PUTS("********");
} else if (!sapi_module.phpinfo_as_text) {
@@ -761,28 +752,28 @@ PHP_MINIT_FUNCTION(ibase)
php_ibase_blobs_minit(INIT_FUNC_ARGS_PASSTHRU);
php_ibase_events_minit(INIT_FUNC_ARGS_PASSTHRU);
php_ibase_service_minit(INIT_FUNC_ARGS_PASSTHRU);
-
- return SUCCESS;
-}
-
+
+ return SUCCESS;
+}
+
PHP_MSHUTDOWN_FUNCTION(ibase)
{
#ifndef PHP_WIN32
/**
- * When the Interbase client API library libgds.so is first loaded, it registers a call to
+ * When the Interbase client API library libgds.so is first loaded, it registers a call to
* gds__cleanup() with atexit(), in order to clean up after itself when the process exits.
* This means that the library is called at process shutdown, and cannot be unloaded beforehand.
- * PHP tries to unload modules after every request [dl()'ed modules], and right before the
+ * PHP tries to unload modules after every request [dl()'ed modules], and right before the
* process shuts down [modules loaded from php.ini]. This results in a segfault for this module.
* By NULLing the dlopen() handle in the module entry, Zend omits the call to dlclose(),
* ensuring that the module will remain present until the process exits. However, the functions
- * and classes exported by the module will not be available until the module is 'reloaded'.
+ * and classes exported by the module will not be available until the module is 'reloaded'.
* When reloaded, dlopen() will return the handle of the already loaded module. The module will
* be unloaded automatically when the process exits.
*/
zend_module_entry *ibase_entry;
- if (SUCCESS == zend_hash_find(&module_registry, ibase_module_entry.name,
- strlen(ibase_module_entry.name) +1, (void*) &ibase_entry)) {
+ if ((ibase_entry = zend_hash_str_find_ptr(&module_registry, ibase_module_entry.name,
+ strlen(ibase_module_entry.name))) != NULL) {
ibase_entry->handle = NULL;
}
#endif
@@ -798,14 +789,14 @@ PHP_RSHUTDOWN_FUNCTION(ibase)
RESET_ERRMSG;
return SUCCESS;
-}
-
+}
+
PHP_MINFO_FUNCTION(ibase)
{
char tmp[64], *s;
php_info_print_table_start();
- php_info_print_table_row(2, "Firebird/InterBase Support",
+ php_info_print_table_row(2, "Firebird/InterBase Support",
#ifdef COMPILE_DL_INTERBASE
"dynamic");
#else
@@ -816,10 +807,6 @@ PHP_MINFO_FUNCTION(ibase)
snprintf( (s = tmp), sizeof(tmp), "Firebird API version %d", FB_API_VER);
#elif (SQLDA_CURRENT_VERSION > 1)
s = "Interbase 7.0 and up";
-#elif !defined(DSC_null)
- s = "Interbase 6";
-#else
- s = "Firebird 1.0";
#endif
php_info_print_table_row(2, "Compile-time Client Library Version", s);
@@ -838,12 +825,10 @@ PHP_MINFO_FUNCTION(ibase)
#endif
if (info_func) {
info_func(s = tmp);
- } else {
- s = "Firebird 1.0/Interbase 6";
}
php_info_print_table_row(2, "Run-time Client Library Version", s);
} while (0);
-#endif
+#endif
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -852,12 +837,12 @@ PHP_MINFO_FUNCTION(ibase)
/* }}} */
enum connect_args { DB = 0, USER = 1, PASS = 2, CSET = 3, ROLE = 4, BUF = 0, DLECT = 1, SYNC = 2 };
-
-static char const dpb_args[] = {
+
+static char const dpb_args[] = {
0, isc_dpb_user_name, isc_dpb_password, isc_dpb_lc_ctype, isc_dpb_sql_role_name, 0
};
-
-int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db TSRMLS_DC)
+
+int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db)
{
short i, dpb_len, buf_len = 257-2; /* version byte at the front, and a null at the end */
char dpb_buffer[257] = { isc_dpb_version1, 0 }, *dpb;
@@ -872,7 +857,7 @@ int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db T
}
}
if (largs[BUF] && buf_len > 0) {
- dpb_len = slprintf(dpb, buf_len, "%c\2%c%c", isc_dpb_num_buffers,
+ dpb_len = slprintf(dpb, buf_len, "%c\2%c%c", isc_dpb_num_buffers,
(char)(largs[BUF] >> 8), (char)(largs[BUF] & 0xff));
dpb += dpb_len;
buf_len -= dpb_len;
@@ -883,7 +868,7 @@ int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db T
buf_len -= dpb_len;
}
if (isc_attach_database(IB_STATUS, (short)len[DB], args[DB], db, (short)(dpb-dpb_buffer), dpb_buffer)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
return FAILURE;
}
return SUCCESS;
@@ -896,21 +881,21 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
int i, len[] = { 0, 0, 0, 0, 0 };
long largs[] = { 0, 0, 0 };
PHP_MD5_CTX hash_context;
- zend_rsrc_list_entry new_index_ptr, *le;
+ zend_resource new_index_ptr, *le;
isc_db_handle db_handle = NULL;
ibase_db_link *ib_link;
RESET_ERRMSG;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ssssllsl",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "|ssssllsl",
&args[DB], &len[DB], &args[USER], &len[USER], &args[PASS], &len[PASS],
&args[CSET], &len[CSET], &largs[BUF], &largs[DLECT], &args[ROLE], &len[ROLE],
&largs[SYNC])) {
RETURN_FALSE;
}
-
+
/* restrict to the server/db in the .ini if in safe mode */
- if ((!len[DB] || PG(sql_safe_mode)) && (c = INI_STR("ibase.default_db"))) {
+ if ((!len[DB] || PG(sql_safe_mode)) && (c = INI_STR("ibase.default_db"))) {
args[DB] = c;
len[DB] = strlen(c);
}
@@ -926,7 +911,7 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
args[CSET] = c;
len[CSET] = strlen(c);
}
-
+
/* don't want usernames and passwords floating around */
PHP_MD5Init(&hash_context);
for (i = 0; i < sizeof(args)/sizeof(char*); ++i) {
@@ -935,67 +920,71 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
for (i = 0; i < sizeof(largs)/sizeof(long); ++i) {
PHP_MD5Update(&hash_context,(char*)&largs[i],sizeof(long));
}
- PHP_MD5Final(hash, &hash_context);
-
+ PHP_MD5Final((unsigned char*)hash, &hash_context);
+
/* try to reuse a connection */
- if (SUCCESS == zend_hash_find(&EG(regular_list), hash, sizeof(hash), (void *) &le)) {
- long xlink;
- int type;
+ if ((le = zend_hash_str_find_ptr(&EG(regular_list), hash, sizeof(hash)-1)) != NULL) {
+ zend_resource *xlink;
- if (Z_TYPE_P(le) != le_index_ptr) {
+ if (le->type != le_index_ptr) {
RETURN_FALSE;
}
-
- xlink = (long) le->ptr;
- if (zend_list_find(xlink, &type) && ((!persistent && type == le_link) || type == le_plink)) {
- zend_list_addref(xlink);
- RETURN_RESOURCE(IBG(default_link) = xlink);
+
+ xlink = (zend_resource*) le->ptr;
+ if ((!persistent && xlink->type == le_link) || xlink->type == le_plink) {
+ if (IBG(default_link) > 0) {
+ zval *link = zend_hash_index_find(&EG(regular_list), IBG(default_link));
+ if (link) {
+ zend_list_delete(Z_RES_P(link));
+ }
+ }
+ xlink->gc.refcount++;
+ xlink->gc.refcount++;
+ IBG(default_link) = xlink->handle;
+ RETVAL_RES(xlink);
} else {
- zend_hash_del(&EG(regular_list), hash, sizeof(hash));
+ zend_hash_str_del(&EG(regular_list), hash, sizeof(hash)-1);
}
- }
+ }
/* ... or a persistent one */
- switch (zend_hash_find(&EG(persistent_list), hash, sizeof(hash), (void *) &le)) {
+ do {
long l;
-
static char info[] = { isc_info_base_level, isc_info_end };
char result[8];
ISC_STATUS status[20];
- case SUCCESS:
-
- if (Z_TYPE_P(le) != le_plink) {
- RETURN_FALSE;
- }
- /* check if connection has timed out */
- ib_link = (ibase_db_link *) le->ptr;
- if (!isc_database_info(status, &ib_link->handle, sizeof(info), info, sizeof(result), result)) {
- ZEND_REGISTER_RESOURCE(return_value, ib_link, le_plink);
- break;
+ if ((le = zend_hash_str_find_ptr(&EG(persistent_list), hash, sizeof(hash)-1)) != NULL) {
+ if (le->type != le_plink) {
+ RETURN_FALSE;
+ }
+ /* check if connection has timed out */
+ ib_link = (ibase_db_link *) le->ptr;
+ if (!isc_database_info(status, &ib_link->handle, sizeof(info), info, sizeof(result), result)) {
+ RETVAL_RES(zend_register_resource(ib_link, le_plink));
+ break;
+ }
+ zend_hash_str_del(&EG(persistent_list), hash, sizeof(hash)-1);
}
- zend_hash_del(&EG(persistent_list), hash, sizeof(hash));
-
- default:
/* no link found, so we have to open one */
-
+
if ((l = INI_INT("ibase.max_links")) != -1 && IBG(num_links) >= l) {
- _php_ibase_module_error("Too many open links (%ld)" TSRMLS_CC, IBG(num_links));
+ _php_ibase_module_error("Too many open links (%ld)", IBG(num_links));
RETURN_FALSE;
}
-
+
/* create the ib_link */
- if (FAILURE == _php_ibase_attach_db(args, len, largs, &db_handle TSRMLS_CC)) {
+ if (FAILURE == _php_ibase_attach_db(args, len, largs, &db_handle)) {
RETURN_FALSE;
}
-
+
/* use non-persistent if allowed number of persistent links is exceeded */
if (!persistent || ((l = INI_INT("ibase.max_persistent") != -1) && IBG(num_persistent) >= l)) {
ib_link = (ibase_db_link *) emalloc(sizeof(ibase_db_link));
- ZEND_REGISTER_RESOURCE(return_value, ib_link, le_link);
+ RETVAL_RES(zend_register_resource(ib_link, le_link));
} else {
- zend_rsrc_list_entry new_le;
+ zend_resource new_le;
ib_link = (ibase_db_link *) malloc(sizeof(ibase_db_link));
if (!ib_link) {
@@ -1003,32 +992,40 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
}
/* hash it up */
- Z_TYPE(new_le) = le_plink;
+ new_le.type = le_plink;
new_le.ptr = ib_link;
- if (FAILURE == zend_hash_update(&EG(persistent_list), hash, sizeof(hash),
- (void *) &new_le, sizeof(zend_rsrc_list_entry), NULL)) {
+ if (zend_hash_str_update_mem(&EG(persistent_list), hash, sizeof(hash)-1,
+ (void *) &new_le, sizeof(zend_resource)) == NULL) {
free(ib_link);
RETURN_FALSE;
}
- ZEND_REGISTER_RESOURCE(return_value, ib_link, le_plink);
+ RETVAL_RES(zend_register_resource(ib_link, le_plink));
++IBG(num_persistent);
}
ib_link->handle = db_handle;
ib_link->dialect = largs[DLECT] ? (unsigned short)largs[DLECT] : SQL_DIALECT_CURRENT;
ib_link->tr_list = NULL;
ib_link->event_head = NULL;
-
+
++IBG(num_links);
- }
+ } while (0);
/* add it to the hash */
- new_index_ptr.ptr = (void *) Z_LVAL_P(return_value);
- Z_TYPE(new_index_ptr) = le_index_ptr;
- if (FAILURE == zend_hash_update(&EG(regular_list), hash, sizeof(hash),
- (void *) &new_index_ptr, sizeof(zend_rsrc_list_entry), NULL)) {
+ new_index_ptr.ptr = (void *) Z_RES_P(return_value);
+ new_index_ptr.type = le_index_ptr;
+ if (zend_hash_str_update_mem(&EG(regular_list), hash, sizeof(hash)-1,
+ (void *) &new_index_ptr, sizeof(zend_resource)) == NULL) {
RETURN_FALSE;
}
- zend_list_addref(IBG(default_link) = Z_LVAL_P(return_value));
+ if (IBG(default_link) > 0) {
+ zval *link = zend_hash_index_find(&EG(regular_list), IBG(default_link));
+ if (link) {
+ zend_list_delete(Z_RES_P(link));
+ }
+ }
+ IBG(default_link) = Z_RES_P(return_value)->handle;
+ Z_TRY_ADDREF_P(return_value);
+ Z_TRY_ADDREF_P(return_value);
}
/* }}} */
@@ -1057,21 +1054,30 @@ PHP_FUNCTION(ibase_close)
int link_id;
RESET_ERRMSG;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &link_arg) == FAILURE) {
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &link_arg) == FAILURE) {
return;
}
-
+
if (ZEND_NUM_ARGS() == 0) {
link_id = IBG(default_link);
CHECK_LINK(link_id);
IBG(default_link) = -1;
} else {
- link_id = Z_RESVAL_P(link_arg);
+ link_id = Z_RES_P(link_arg)->handle;
}
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, &link_arg, link_id, LE_LINK, le_link, le_plink);
- zend_list_delete(link_id);
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(link_arg, LE_LINK, le_link, le_plink);
+ if (!link_arg) {
+ link_arg = zend_hash_index_find(&EG(regular_list), link_id);
+ zend_list_delete(Z_RES_P(link_arg));
+ }
+ /* we have at least 3 additional references to this resource ??? */
+ if (GC_REFCOUNT(Z_RES_P(link_arg)) < 4) {
+ zend_list_close(Z_RES_P(link_arg));
+ } else {
+ zend_list_delete(Z_RES_P(link_arg));
+ }
RETURN_TRUE;
}
/* }}} */
@@ -1086,23 +1092,23 @@ PHP_FUNCTION(ibase_drop_db)
int link_id;
RESET_ERRMSG;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &link_arg) == FAILURE) {
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &link_arg) == FAILURE) {
return;
}
-
+
if (ZEND_NUM_ARGS() == 0) {
link_id = IBG(default_link);
CHECK_LINK(link_id);
IBG(default_link) = -1;
} else {
- link_id = Z_RESVAL_P(link_arg);
+ link_id = Z_RES_P(link_arg)->handle;
}
-
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, &link_arg, link_id, LE_LINK, le_link, le_plink);
+
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(link_arg, LE_LINK, le_link, le_plink);
if (isc_drop_database(IB_STATUS, &ib_link->handle)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
@@ -1111,7 +1117,11 @@ PHP_FUNCTION(ibase_drop_db)
if (l->trans != NULL) l->trans->handle = NULL;
}
- zend_list_delete(link_id);
+ if (!link_arg) {
+ link_arg = zend_hash_index_find(&EG(regular_list), link_id);
+ zend_list_delete(Z_RES_P(link_arg));
+ }
+ zend_list_delete(Z_RES_P(link_arg));
RETURN_TRUE;
}
/* }}} */
@@ -1130,22 +1140,21 @@ PHP_FUNCTION(ibase_trans)
ibase_trans *ib_trans;
isc_tr_handle tr_handle = NULL;
ISC_STATUS result;
-
+
RESET_ERRMSG;
argn = ZEND_NUM_ARGS();
/* (1+argn) is an upper bound for the number of links this trans connects to */
ib_link = (ibase_db_link **) safe_emalloc(sizeof(ibase_db_link *),1+argn,0);
-
+
if (argn > 0) {
long trans_argl = 0;
char *tpb;
ISC_TEB *teb;
- zval ***args = NULL;
+ zval *args = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argn) == FAILURE) {
- efree(args);
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "+", &args, &argn) == FAILURE) {
efree(ib_link);
RETURN_FALSE;
}
@@ -1153,20 +1162,19 @@ PHP_FUNCTION(ibase_trans)
teb = (ISC_TEB *) safe_emalloc(sizeof(ISC_TEB),argn,0);
tpb = (char *) safe_emalloc(TPB_MAX_SIZE,argn,0);
- /* enumerate all the arguments: assume every non-resource argument
+ /* enumerate all the arguments: assume every non-resource argument
specifies modifiers for the link ids that follow it */
for (i = 0; i < argn; ++i) {
-
- if (Z_TYPE_PP(args[i]) == IS_RESOURCE) {
-
- if (!ZEND_FETCH_RESOURCE2_NO_RETURN(ib_link[link_cnt], ibase_db_link *, args[i], -1, LE_LINK, le_link, le_plink)) {
+
+ if (Z_TYPE(args[i]) == IS_RESOURCE) {
+
+ if ((ib_link[link_cnt] = (ibase_db_link *)zend_fetch_resource2_ex(&args[i], LE_LINK, le_link, le_plink)) == NULL) {
efree(teb);
efree(tpb);
efree(ib_link);
- efree(args);
RETURN_FALSE;
}
-
+
/* copy the most recent modifier string into tbp[] */
memcpy(&tpb[TPB_MAX_SIZE * link_cnt], last_tpb, TPB_MAX_SIZE);
@@ -1174,15 +1182,15 @@ PHP_FUNCTION(ibase_trans)
teb[link_cnt].db_ptr = &ib_link[link_cnt]->handle;
teb[link_cnt].tpb_len = tpb_len;
teb[link_cnt].tpb_ptr = &tpb[TPB_MAX_SIZE * link_cnt];
-
+
++link_cnt;
-
+
} else {
-
+
tpb_len = 0;
- convert_to_long_ex(args[i]);
- trans_argl = Z_LVAL_PP(args[i]);
+ convert_to_long_ex(&args[i]);
+ trans_argl = Z_LVAL(args[i]);
if (trans_argl != PHP_IBASE_DEFAULT) {
last_tpb[tpb_len++] = isc_tpb_version3;
@@ -1200,14 +1208,14 @@ PHP_FUNCTION(ibase_trans)
if (PHP_IBASE_REC_VERSION == (trans_argl & PHP_IBASE_REC_VERSION)) {
last_tpb[tpb_len++] = isc_tpb_rec_version;
} else if (PHP_IBASE_REC_NO_VERSION == (trans_argl & PHP_IBASE_REC_NO_VERSION)) {
- last_tpb[tpb_len++] = isc_tpb_no_rec_version;
- }
+ last_tpb[tpb_len++] = isc_tpb_no_rec_version;
+ }
} else if (PHP_IBASE_CONSISTENCY == (trans_argl & PHP_IBASE_CONSISTENCY)) {
last_tpb[tpb_len++] = isc_tpb_consistency;
} else if (PHP_IBASE_CONCURRENCY == (trans_argl & PHP_IBASE_CONCURRENCY)) {
last_tpb[tpb_len++] = isc_tpb_concurrency;
}
-
+
/* lock resolution */
if (PHP_IBASE_NOWAIT == (trans_argl & PHP_IBASE_NOWAIT)) {
last_tpb[tpb_len++] = isc_tpb_nowait;
@@ -1216,29 +1224,28 @@ PHP_FUNCTION(ibase_trans)
}
}
}
- }
-
+ }
+
if (link_cnt > 0) {
result = isc_start_multiple(IB_STATUS, &tr_handle, link_cnt, teb);
}
- efree(args);
efree(tpb);
efree(teb);
}
if (link_cnt == 0) {
link_cnt = 1;
- if (!ZEND_FETCH_RESOURCE2_NO_RETURN(ib_link[0], ibase_db_link *, NULL, IBG(default_link), LE_LINK, le_link, le_plink)) {
+ if ((ib_link[0] = (ibase_db_link *)zend_fetch_resource2_ex(IBG(default_link), LE_LINK, le_link, le_plink)) == NULL) {
efree(ib_link);
RETURN_FALSE;
}
result = isc_start_transaction(IB_STATUS, &tr_handle, 1, &ib_link[0]->handle, tpb_len, last_tpb);
}
-
+
/* start the transaction */
if (result) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
efree(ib_link);
RETURN_FALSE;
}
@@ -1251,7 +1258,7 @@ PHP_FUNCTION(ibase_trans)
for (i = 0; i < link_cnt; ++i) {
ibase_tr_list **l;
ib_trans->db_link[i] = ib_link[i];
-
+
/* the first item in the connection-transaction list is reserved for the default transaction */
if (ib_link[i]->tr_list == NULL) {
ib_link[i]->tr_list = (ibase_tr_list *) emalloc(sizeof(ibase_tr_list));
@@ -1266,14 +1273,15 @@ PHP_FUNCTION(ibase_trans)
(*l)->next = NULL;
}
efree(ib_link);
- ZEND_REGISTER_RESOURCE(return_value, ib_trans, le_trans);
+ RETVAL_RES(zend_register_resource(ib_trans, le_trans));
+ Z_TRY_ADDREF_P(return_value);
}
/* }}} */
-int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans TSRMLS_DC) /* {{{ */
+int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans) /* {{{ */
{
if (ib_link == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database link");
+ php_error_docref(NULL, E_WARNING, "Invalid database link");
return FAILURE;
}
@@ -1297,7 +1305,7 @@ int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans TSRMLS_DC)
}
if (tr->handle == NULL) {
if (isc_start_transaction(IB_STATUS, &tr->handle, 1, &ib_link->handle, 0, NULL)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
return FAILURE;
}
}
@@ -1314,33 +1322,32 @@ static void _php_ibase_trans_end(INTERNAL_FUNCTION_PARAMETERS, int commit) /* {{
ISC_STATUS result;
ibase_db_link *ib_link;
zval *arg = NULL;
- int type;
RESET_ERRMSG;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &arg) == FAILURE) {
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &arg) == FAILURE) {
return;
}
if (ZEND_NUM_ARGS() == 0) {
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, IBG(default_link), LE_LINK, le_link, le_plink);
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(IBG(default_link), LE_LINK, le_link, le_plink);
if (ib_link->tr_list == NULL || ib_link->tr_list->trans == NULL) {
/* this link doesn't have a default transaction */
- _php_ibase_module_error("Default link has no default transaction" TSRMLS_CC);
+ _php_ibase_module_error("Default link has no default transaction");
RETURN_FALSE;
}
trans = ib_link->tr_list->trans;
} else {
/* one id was passed, could be db or trans id */
- if (zend_list_find(Z_RESVAL_P(arg), &type) && type == le_trans) {
- ZEND_FETCH_RESOURCE(trans, ibase_trans *, &arg, -1, LE_TRANS, le_trans);
- res_id = Z_RESVAL_P(arg);
+ if (Z_RES_P(arg)->type == le_trans) {
+ trans = (ibase_trans *)zend_fetch_resource_ex(arg, LE_TRANS, le_trans);
+ res_id = Z_RES_P(arg)->handle;
} else {
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, &arg, -1, LE_LINK, le_link, le_plink);
+ ib_link = (ibase_db_link *)zend_fetch_resource2_ex(arg, LE_LINK, le_link, le_plink);
if (ib_link->tr_list == NULL || ib_link->tr_list->trans == NULL) {
/* this link doesn't have a default transaction */
- _php_ibase_module_error("Link has no default transaction" TSRMLS_CC);
+ _php_ibase_module_error("Link has no default transaction");
RETURN_FALSE;
}
trans = ib_link->tr_list->trans;
@@ -1361,15 +1368,15 @@ static void _php_ibase_trans_end(INTERNAL_FUNCTION_PARAMETERS, int commit) /* {{
result = isc_commit_retaining(IB_STATUS, &trans->handle);
break;
}
-
+
if (result) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
/* Don't try to destroy implicitly opened transaction from list... */
if ((commit & RETAIN) == 0 && res_id != 0) {
- zend_list_delete(res_id);
+ zend_list_delete(Z_RES_P(arg));
}
RETURN_TRUE;
}
@@ -1413,8 +1420,8 @@ PHP_FUNCTION(ibase_gen_id)
{
zval *link = NULL;
char query[128], *generator;
- int gen_len;
- long inc = 1;
+ size_t gen_len;
+ zend_long inc = 1;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
XSQLDA out_sqlda;
@@ -1422,24 +1429,24 @@ PHP_FUNCTION(ibase_gen_id)
RESET_ERRMSG;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lr", &generator, &gen_len,
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|lr", &generator, &gen_len,
&inc, &link)) {
RETURN_FALSE;
}
-
+
if (gen_len > 31) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid generator name");
+ php_error_docref(NULL, E_WARNING, "Invalid generator name");
RETURN_FALSE;
}
PHP_IBASE_LINK_TRANS(link, ib_link, trans);
-
+
snprintf(query, sizeof(query), "SELECT GEN_ID(%s,%ld) FROM rdb$database", generator, inc);
/* allocate a minimal descriptor area */
out_sqlda.sqln = out_sqlda.sqld = 1;
out_sqlda.version = SQLDA_CURRENT_VERSION;
-
+
/* allocate the field for the result */
out_sqlda.sqlvar[0].sqltype = SQL_INT64;
out_sqlda.sqlvar[0].sqlscale = 0;
@@ -1449,7 +1456,7 @@ PHP_FUNCTION(ibase_gen_id)
/* execute the query */
if (isc_dsql_exec_immed2(IB_STATUS, &ib_link->handle, &trans->handle, 0, query,
SQL_DIALECT_CURRENT, NULL, &out_sqlda)) {
- _php_ibase_error(TSRMLS_C);
+ _php_ibase_error();
RETURN_FALSE;
}
@@ -1460,14 +1467,14 @@ PHP_FUNCTION(ibase_gen_id)
int l;
l = spprintf(&res, 0, "%" LL_MASK "d", result);
- RETURN_STRINGL(res, l, 0);
+ RETURN_STRINGL(res, l);
}
#endif
RETURN_LONG((long)result);
}
/* }}} */
-
+
#endif /* HAVE_IBASE */
/*
diff --git a/ext/interbase/interbase.dsp b/ext/interbase/interbase.dsp
deleted file mode 100644
index c151deb40c..0000000000
--- a/ext/interbase/interbase.dsp
+++ /dev/null
@@ -1,135 +0,0 @@
-# Microsoft Developer Studio Project File - Name="interbase" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=interbase - Win32 Debug_TS
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "interbase.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "interbase.mak" CFG="interbase - Win32 Debug_TS"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "interbase - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "interbase - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "interbase"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "interbase - Win32 Debug_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug_TS"
-# PROP BASE Intermediate_Dir "Debug_TS"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_TS"
-# PROP Intermediate_Dir "Debug_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\main" /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\Interbase SDK\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "INTERBASE_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=1 /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\main" /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\Interbase SDK\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "INTERBASE_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_IBASE=1 /D "COMPILE_DL_INTERBASE" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40d /d "_DEBUG"
-# ADD RSC /l 0x40d /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ib_util_ms.lib gds32_ms.lib php5ts_debug.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib gds32_ms.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_interbase.dll" /pdbtype:sept /libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Debug_TS"
-
-!ELSEIF "$(CFG)" == "interbase - Win32 Release_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_TS"
-# PROP BASE Intermediate_Dir "Release_TS"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TS"
-# PROP Intermediate_Dir "Release_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\main" /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\Interbase SDK\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "INTERBASE_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_IBASE=1 /D ZEND_DEBUG=0 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\main" /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build\Interbase SDK\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "INTERBASE_EXPORTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_IBASE=1 /D "COMPILE_DL_INTERBASE" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40d /d "NDEBUG"
-# ADD RSC /l 0x40d /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ib_util_ms.lib gds32_ms.lib /nologo /dll /machine:I386
-# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib gds32_ms.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_interbase.dll" /libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-
-!ENDIF
-
-# Begin Target
-
-# Name "interbase - Win32 Debug_TS"
-# Name "interbase - Win32 Release_TS"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\ibase_blobs.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ibase_events.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ibase_query.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ibase_service.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\interbase.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\php_interbase.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\interbase.rc
-# ADD BASE RSC /l 0x413
-# ADD RSC /l 0x413 /i "..\..\main" /i "..\..\win32" /d "PHP_H"
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h
index 229ffe8f2e..b7fb0a340f 100644
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+
@@ -35,8 +35,7 @@
#define IB_STATUS (IBG(status))
-/* XXX ZEND_DEBUG_ is misleading, it should be something like IBASE_DEBUG. */
-#ifdef ZEND_DEBUG_
+#ifdef IBASE_DEBUG
#define IBDEBUG(a) php_printf("::: %s (%d)\n", a, __LINE__);
#endif
@@ -101,8 +100,8 @@ typedef struct event {
unsigned short event_count;
char **events;
char *event_buffer, *result_buffer;
- zval *callback;
- void **thread_ctx;
+ zval callback;
+ void *thread_ctx;
struct event *event_next;
enum event_state { NEW, ACTIVE, DEAD } state;
} ibase_event;
@@ -128,10 +127,10 @@ enum php_interbase_option {
PHP_IBASE_NOWAIT = 256
};
-#ifdef ZTS
-#define IBG(v) TSRMG(ibase_globals_id, zend_ibase_globals *, v)
-#else
-#define IBG(v) (ibase_globals.v)
+#define IBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ibase, v)
+
+#if defined(ZTS) && defined(COMPILE_DL_INTERBASE)
+ZEND_TSRMLS_CACHE_EXTERN();
#endif
#define BLOB_ID_LEN 18
@@ -150,22 +149,22 @@ typedef void (__stdcall *info_func_t)(char*);
typedef void (*info_func_t)(char*);
#endif
-void _php_ibase_error(TSRMLS_D);
-void _php_ibase_module_error(char * TSRMLS_DC, ...)
+void _php_ibase_error(void);
+void _php_ibase_module_error(char *, ...)
PHP_ATTRIBUTE_FORMAT(printf,1,PHP_ATTR_FMT_OFFSET +2);
/* determine if a resource is a link or transaction handle */
-#define PHP_IBASE_LINK_TRANS(pzval, lh, th) \
- do { if (!pzval) { \
- ZEND_FETCH_RESOURCE2(lh, ibase_db_link *, NULL, IBG(default_link), \
- "InterBase link", le_link, le_plink) } \
+#define PHP_IBASE_LINK_TRANS(zv, lh, th) \
+ do { if (!zv) { \
+ lh = (ibase_db_link *)zend_fetch_resource2(IBG(default_link), \
+ "InterBase link", le_link, le_plink); } \
else \
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, &pzval, &lh, &th); \
- if (SUCCESS != _php_ibase_def_trans(lh, &th TSRMLS_CC)) { RETURN_FALSE; } \
+ _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, zv, &lh, &th); \
+ if (SUCCESS != _php_ibase_def_trans(lh, &th)) { RETURN_FALSE; } \
} while (0)
-int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans TSRMLS_DC);
-void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, zval **link_id,
+int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans);
+void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, zval *link_id,
ibase_db_link **ib_link, ibase_trans **trans);
/* provided by ibase_query.c */
@@ -174,13 +173,13 @@ void php_ibase_query_minit(INIT_FUNC_ARGS);
/* provided by ibase_blobs.c */
void php_ibase_blobs_minit(INIT_FUNC_ARGS);
int _php_ibase_string_to_quad(char const *id, ISC_QUAD *qd);
-char *_php_ibase_quad_to_string(ISC_QUAD const qd);
-int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long max_len TSRMLS_DC);
-int _php_ibase_blob_add(zval **string_arg, ibase_blob *ib_blob TSRMLS_DC);
+zend_string *_php_ibase_quad_to_string(ISC_QUAD const qd);
+int _php_ibase_blob_get(zval *return_value, ibase_blob *ib_blob, unsigned long max_len);
+int _php_ibase_blob_add(zval *string_arg, ibase_blob *ib_blob);
/* provided by ibase_events.c */
void php_ibase_events_minit(INIT_FUNC_ARGS);
-void _php_ibase_free_event(ibase_event *event TSRMLS_DC);
+void _php_ibase_free_event(ibase_event *event);
/* provided by ibase_service.c */
void php_ibase_service_minit(INIT_FUNC_ARGS);
diff --git a/ext/interbase/php_ibase_udf.c b/ext/interbase/php_ibase_udf.c
index c26fbf4466..7102c17c56 100644
--- a/ext/interbase/php_ibase_udf.c
+++ b/ext/interbase/php_ibase_udf.c
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+
@@ -20,27 +20,27 @@
* This UDF library adds the ability to call PHP functions from SQL
* statements. Because of SQL's strong typing, you will have to declare
* an external function for every combination { output type, #args } that
-* your application requires.
-*
+* your application requires.
+*
* Declare the functions like this:
-*
+*
* DECLARE EXTERNAL FUNCTION CALL_PHP1
* CSTRING(xx),
* <return type> BY DESCRIPTOR,
* INTEGER BY DESCRIPTOR
* RETURNS PARAMETER 2
* ENTRY_POINT 'udf_call_php1' MODULE_NAME 'php_ibase_udf'
-*
+*
* DECLARE EXTERNAL FUNCTION CALL_PHP2
* CSTRING(xx),
-* <return type> BY DESCRIPTOR,
+* <return type> BY DESCRIPTOR,
* INTEGER BY DESCRIPTOR,
* INTEGER BY DESCRIPTOR
* RETURNS PARAMETER 2
* ENTRY_POINT 'udf_call_php2' MODULE_NAME 'php_ibase_udf'
-*
+*
* ... and so on. [for up to 8 input arguments]
-*
+*
* The first input parameter contains the name of the PHP function you want
* to call. The second argument is the result. (omit this argument when calling
* the function) The return type of the function is the declared type of the
@@ -49,13 +49,13 @@
* The arguments should have their types declared as well, but you're free
* to pass arguments of other types instead. They will be converted to the
* best matching PHP type before being passed to the PHP function.
-*
+*
* The declared functions can be called from SQL like:
-*
+*
* SELECT * FROM <table> WHERE CALL_PHP1('soundex',<field>) NOT LIKE ?
* or
* UPDATE <table> SET <field> = CALL_PHP1('ucwords',<field>)
-*
+*
* Additionally, there's a function 'exec_php' which allows the contents
* of text BLOB fields to be parsed and executed by PHP. This is most useful
* for declaring functions that can then be called with CALL_PHPx.
@@ -80,11 +80,11 @@
* `php-config --libs` -o php_ibase_udf.so php_ibase_udf.c
*
* If you connect to the classic server by TCP/IP, you should build the
-* PHP embedded static library and link against that.
+* PHP embedded static library and link against that.
*
* gcc -shared `php-config --includes` `php-config --ldflags` \
* `php-config --libs` -o php_ibase_udf.so php_ibase_udf.c \
-* /usr/lib/libphp5.a
+* /usr/lib/libphp7.a
*
* If you use the super server, you should also link against the embedded
* library, but be sure to enable thread safety, as the super server is
@@ -127,12 +127,12 @@ pthread_mutex_t mtx_res = PTHREAD_MUTEX_INITIALIZER;
static void __attribute__((constructor)) init()
{
- php_embed_init(0, NULL PTSRMLS_CC);
+ php_embed_init(0, NULL P);
}
static void __attribute__((destructor)) fini()
{
- php_embed_shutdown(TSRMLS_C);
+ php_embed_shutdown();
}
#endif
@@ -147,7 +147,7 @@ void exec_php(BLOBCALLBACK b, PARAMDSC *res, ISC_SHORT *init)
ISC_USHORT read;
for (code[remaining] = '\0'; remaining > 0; remaining -= read)
- b->blob_get_segment(b->blob_handle, &code[i++<<16],min(0x10000,remaining), &read);
+ b->blob_get_segment(b->blob_handle, &code[i++<<16],min(0x10000,remaining), &read);
LOCK();
@@ -156,17 +156,17 @@ void exec_php(BLOBCALLBACK b, PARAMDSC *res, ISC_SHORT *init)
default:
#ifdef PHP_EMBED
php_request_shutdown(NULL);
- if (FAILURE == (result = php_request_startup(TSRMLS_C))) {
+ if (FAILURE == (result = php_request_startup())) {
break;
}
case 0:
#endif
/* feed it to the parser */
zend_first_try {
- result = zend_eval_stringl(code, b->blob_total_length, NULL, "Firebird Embedded PHP engine" TSRMLS_CC);
+ result = zend_eval_stringl(code, b->blob_total_length, NULL, "Firebird Embedded PHP engine");
} zend_end_try();
}
-
+
UNLOCK();
free(code);
@@ -183,31 +183,27 @@ static ISC_INT64 const scales[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10
static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
{
do {
- zval callback, args[4], *argp[4], return_value;
+ zval callback, args[4], return_value;
PARAMVARY *res = (PARAMVARY*)r->dsc_address;
int i;
- INIT_ZVAL(callback);
- ZVAL_STRING(&callback,name,0);
+ ZVAL_STRING(&callback, name);
LOCK();
-
+
/* check if the requested function exists */
- if (!zend_is_callable(&callback, 0, NULL TSRMLS_CC)) {
+ if (!zend_is_callable(&callback, 0, NULL)) {
break;
}
-
+
UNLOCK();
-
+
/* create the argument array */
for (i = 0; i < argc; ++i) {
- INIT_ZVAL(args[i]);
- argp[i] = &args[i];
-
/* test arg for null */
if (argv[i]->dsc_flags & DSC_null) {
- ZVAL_NULL(argp[i]);
+ ZVAL_NULL(&args[i]);
continue;
}
@@ -218,32 +214,35 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
char d[64];
case dtype_cstring:
- ZVAL_STRING(argp[i], (char*)argv[i]->dsc_address,0);
+//???
+ ZVAL_STRING(&args[i], (char*)argv[i]->dsc_address);
break;
case dtype_text:
- ZVAL_STRINGL(argp[i], (char*)argv[i]->dsc_address, argv[i]->dsc_length,0);
+//???
+ ZVAL_STRINGL(&args[i], (char*)argv[i]->dsc_address, argv[i]->dsc_length);
break;
case dtype_varying:
- ZVAL_STRINGL(argp[i], ((PARAMVARY*)argv[i]->dsc_address)->vary_string,
- ((PARAMVARY*)argv[i]->dsc_address)->vary_length,0);
+//???
+ ZVAL_STRINGL(&args[i], ((PARAMVARY*)argv[i]->dsc_address)->vary_string,
+ ((PARAMVARY*)argv[i]->dsc_address)->vary_length);
break;
case dtype_short:
if (argv[i]->dsc_scale == 0) {
- ZVAL_LONG(argp[i], *(short*)argv[i]->dsc_address);
+ ZVAL_LONG(&args[i], *(short*)argv[i]->dsc_address);
} else {
- ZVAL_DOUBLE(argp[i],
+ ZVAL_DOUBLE(&args[i],
((double)*(short*)argv[i]->dsc_address)/scales[-argv[i]->dsc_scale]);
}
break;
case dtype_long:
if (argv[i]->dsc_scale == 0) {
- ZVAL_LONG(argp[i], *(ISC_LONG*)argv[i]->dsc_address);
+ ZVAL_LONG(&args[i], *(ISC_LONG*)argv[i]->dsc_address);
} else {
- ZVAL_DOUBLE(argp[i],
+ ZVAL_DOUBLE(&args[i],
((double)*(ISC_LONG*)argv[i]->dsc_address)/scales[-argv[i]->dsc_scale]);
}
break;
@@ -252,33 +251,33 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
l = *(ISC_INT64*)argv[i]->dsc_address;
if (argv[i]->dsc_scale == 0 && l <= LONG_MAX && l >= LONG_MIN) {
- ZVAL_LONG(argp[i], (long)l);
+ ZVAL_LONG(&args[i], (long)l);
} else {
- ZVAL_DOUBLE(argp[i], ((double)l)/scales[-argv[i]->dsc_scale]);
+ ZVAL_DOUBLE(&args[i], ((double)l)/scales[-argv[i]->dsc_scale]);
}
break;
case dtype_real:
- ZVAL_DOUBLE(argp[i], *(float*)argv[i]->dsc_address);
+ ZVAL_DOUBLE(&args[i], *(float*)argv[i]->dsc_address);
break;
case dtype_double:
- ZVAL_DOUBLE(argp[i], *(double*)argv[i]->dsc_address);
+ ZVAL_DOUBLE(&args[i], *(double*)argv[i]->dsc_address);
break;
case dtype_sql_date:
isc_decode_sql_date((ISC_DATE*)argv[i]->dsc_address, &t);
- ZVAL_STRINGL(argp[i], d, strftime(d, sizeof(d), INI_STR("ibase.dateformat"), &t),1);
+ ZVAL_STRINGL(&args[i], d, strftime(d, sizeof(d), INI_STR("ibase.dateformat"), &t),1);
break;
case dtype_sql_time:
isc_decode_sql_time((ISC_TIME*)argv[i]->dsc_address, &t);
- ZVAL_STRINGL(argp[i], d, strftime(d, sizeof(d), INI_STR("ibase.timeformat"), &t),1);
+ ZVAL_STRINGL(&args[i], d, strftime(d, sizeof(d), INI_STR("ibase.timeformat"), &t),1);
break;
case dtype_timestamp:
isc_decode_timestamp((ISC_TIMESTAMP*)argv[i]->dsc_address, &t);
- ZVAL_STRINGL(argp[i], d, strftime(d, sizeof(d), INI_STR("ibase.timestampformat"), &t),1);
+ ZVAL_STRINGL(&args[i], d, strftime(d, sizeof(d), INI_STR("ibase.timestampformat"), &t));
break;
}
}
@@ -287,11 +286,11 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
/* now call the function */
if (FAILURE == call_user_function(EG(function_table), NULL,
- &callback, &return_value, argc, argp TSRMLS_CC)) {
+ &callback, &return_value, argc, args)) {
UNLOCK();
break;
}
-
+
UNLOCK();
for (i = 0; i < argc; ++i) {
@@ -299,11 +298,12 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
case dtype_sql_date:
case dtype_sql_time:
case dtype_timestamp:
- zval_dtor(argp[i]);
-
+ zval_dtor(&args[i]);
}
}
+ zval_dtor(&callback);
+
/* return whatever type we got back from the callback: let DB handle conversion */
switch (Z_TYPE(return_value)) {
@@ -333,19 +333,19 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
r->dsc_length = res->vary_length+2;
break;
}
-
+
zval_dtor(&return_value);
return;
} while (0);
-
+
/**
* If we end up here, we should report an error back to the DB engine, but
* that's not possible. We can however report it back to PHP.
*/
LOCK();
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error calling function '%s' from database", name);
+ php_error_docref(NULL, E_WARNING, "Error calling function '%s' from database", name);
UNLOCK();
}
@@ -370,38 +370,37 @@ void udf_call_php3(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARA
call_php(name, r, 3, args);
}
-void udf_call_php4(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
+void udf_call_php4(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
PARAMDSC *arg4)
{
PARAMDSC *args[4] = { arg1, arg2, arg3, arg4 };
call_php(name, r, 4, args);
}
-void udf_call_php5(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
+void udf_call_php5(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
PARAMDSC *arg4, PARAMDSC *arg5)
{
PARAMDSC *args[5] = { arg1, arg2, arg3, arg4, arg5 };
call_php(name, r, 5, args);
}
-void udf_call_php6(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
+void udf_call_php6(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
PARAMDSC *arg4, PARAMDSC *arg5, PARAMDSC *arg6)
{
PARAMDSC *args[6] = { arg1, arg2, arg3, arg4, arg5, arg6 };
call_php(name, r, 6, args);
}
-void udf_call_php7(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
+void udf_call_php7(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
PARAMDSC *arg4, PARAMDSC *arg5, PARAMDSC *arg6, PARAMDSC *arg7)
{
PARAMDSC *args[7] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7 };
call_php(name, r, 7, args);
}
-void udf_call_php8(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
+void udf_call_php8(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARAMDSC *arg3,
PARAMDSC *arg4, PARAMDSC *arg5, PARAMDSC *arg6, PARAMDSC *arg7, PARAMDSC *arg8)
{
PARAMDSC *args[8] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8 };
call_php(name, r, 8, args);
}
-
diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index e58241c0e1..c1f2feeae4 100644
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+
@@ -24,6 +24,9 @@
extern zend_module_entry ibase_module_entry;
#define phpext_interbase_ptr &ibase_module_entry
+#include "php_version.h"
+#define PHP_INTERBASE_VERSION PHP_VERSION
+
PHP_MINIT_FUNCTION(ibase);
PHP_RINIT_FUNCTION(ibase);
PHP_MSHUTDOWN_FUNCTION(ibase);
diff --git a/ext/interbase/tests/002.phpt b/ext/interbase/tests/002.phpt
index 070a6f0069..37b0a4f344 100644
--- a/ext/interbase/tests/002.phpt
+++ b/ext/interbase/tests/002.phpt
@@ -3,7 +3,7 @@ InterBase: connect, close and pconnect
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
-<?php /* $Id$ */
+<?php
require("interbase.inc");
diff --git a/ext/interbase/tests/003.phpt b/ext/interbase/tests/003.phpt
index 652e3bdc52..8ee86d3e9e 100644
--- a/ext/interbase/tests/003.phpt
+++ b/ext/interbase/tests/003.phpt
@@ -3,7 +3,7 @@ InterBase: misc sql types (may take a while)
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
-<?php /* $Id$ */
+<?php
require("interbase.inc");
ibase_connect($test_base);
diff --git a/ext/interbase/tests/004.phpt b/ext/interbase/tests/004.phpt
index 579445dbdd..e81474a4c4 100644
--- a/ext/interbase/tests/004.phpt
+++ b/ext/interbase/tests/004.phpt
@@ -3,7 +3,7 @@ InterBase: BLOB test
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
-<?php /* $Id$ */
+<?php
require("interbase.inc");
diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt
index 08b8e53ef3..cb68b0a1d5 100644
--- a/ext/interbase/tests/005.phpt
+++ b/ext/interbase/tests/005.phpt
@@ -3,7 +3,7 @@ InterBase: transactions
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
-<?php /* $Id$ */
+<?php
require("interbase.inc");
diff --git a/ext/interbase/tests/006.phpt b/ext/interbase/tests/006.phpt
index ad6120f393..a32807eec0 100644
--- a/ext/interbase/tests/006.phpt
+++ b/ext/interbase/tests/006.phpt
@@ -3,7 +3,7 @@ InterBase: binding (may take a while)
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
-<?php /* $Id$ */
+<?php
require("interbase.inc");
diff --git a/ext/interbase/tests/007.phpt b/ext/interbase/tests/007.phpt
index 069b7eda26..92e7c73984 100644
--- a/ext/interbase/tests/007.phpt
+++ b/ext/interbase/tests/007.phpt
@@ -3,7 +3,7 @@ InterBase: array handling
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
-<?php /* $Id$ */
+<?php
require("interbase.inc");
diff --git a/ext/interbase/tests/008.phpt b/ext/interbase/tests/008.phpt
index 8292fc38c5..6728b9d7d3 100644
--- a/ext/interbase/tests/008.phpt
+++ b/ext/interbase/tests/008.phpt
@@ -6,7 +6,7 @@ if (PHP_OS == "WINNT") echo "skip";
include("skipif.inc");
?>
--FILE--
-<?php /* $Id$ */
+<?php
require("interbase.inc");
diff --git a/ext/interbase/tests/ibase_close_001.phpt b/ext/interbase/tests/ibase_close_001.phpt
index 6e31916abe..f74d109109 100644
--- a/ext/interbase/tests/ibase_close_001.phpt
+++ b/ext/interbase/tests/ibase_close_001.phpt
@@ -18,7 +18,7 @@ var_dump(ibase_close('foo'));
bool(true)
bool(true)
-Warning: ibase_close(): %d is not a valid Firebird/InterBase link resource in %s on line %d
+Warning: ibase_close(): supplied resource is not a valid Firebird/InterBase link resource in %s on line %d
bool(false)
Warning: ibase_close() expects parameter 1 to be resource,%string given in %s on line %d
diff --git a/ext/interbase/tests/ibase_free_query_001.phpt b/ext/interbase/tests/ibase_free_query_001.phpt
index bedec71731..069f0f0424 100644
--- a/ext/interbase/tests/ibase_free_query_001.phpt
+++ b/ext/interbase/tests/ibase_free_query_001.phpt
@@ -21,7 +21,7 @@ var_dump(ibase_free_query($x));
--EXPECTF--
bool(true)
-Warning: ibase_free_query(): 11 is not a valid Firebird/InterBase query resource in %s on line %d
+Warning: ibase_free_query(): supplied resource is not a valid Firebird/InterBase query resource in %s on line %d
bool(false)
Warning: ibase_free_query(): supplied resource is not a valid Firebird/InterBase query resource in %s on line %d
diff --git a/ext/interbase/tests/ibase_trans_001.phpt b/ext/interbase/tests/ibase_trans_001.phpt
index cceb60e9a1..d8b7c81a1b 100644
--- a/ext/interbase/tests/ibase_trans_001.phpt
+++ b/ext/interbase/tests/ibase_trans_001.phpt
@@ -18,4 +18,6 @@ var_dump(ibase_close($x));
resource(%d) of type (Firebird/InterBase transaction)
resource(%d) of type (Firebird/InterBase transaction)
bool(true)
-bool(true)
+
+Warning: ibase_close(): supplied resource is not a valid Firebird/InterBase link resource in %s on line %d
+bool(false)
View Lorry Controller Status