abies Tue Feb 17 07:53:55 2004 EDT
Modified files:
/php-src/ext/interbase ibase_blobs.c ibase_events.c interbase.c
php_ibase_includes.h
/php-src/ext/interbase/tests 004.phpt
Log:
Fixed unregistered bugs in event handling
Cleaned up some of the code
Removed ISC_QUAD from static initializers because it looks different on
some platforms
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_blobs.c?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/interbase/ibase_blobs.c
diff -u php-src/ext/interbase/ibase_blobs.c:1.4 php-src/ext/interbase/ibase_blobs.c:1.5
--- php-src/ext/interbase/ibase_blobs.c:1.4 Mon Feb 2 08:47:56 2004
+++ php-src/ext/interbase/ibase_blobs.c Tue Feb 17 07:53:53 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ibase_blobs.c,v 1.4 2004/02/02 13:47:56 abies Exp $ */
+/* $Id: ibase_blobs.c,v 1.5 2004/02/17 12:53:53 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -86,7 +86,8 @@
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);
+ 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]);
}
@@ -183,32 +184,18 @@
Create blob for adding data */
PHP_FUNCTION(ibase_blob_create)
{
- zval **link_arg;
+ zval *link = NULL;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
ibase_blob *ib_blob;
RESET_ERRMSG;
-
- switch (ZEND_NUM_ARGS()) {
- case 0:
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
- break;
- case 1:
- if (zend_get_parameters_ex(1, &link_arg) == FAILURE) {
- RETURN_FALSE;
- }
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU,
link_arg, &ib_link, &trans);
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
- /* open default transaction */
- if (_php_ibase_def_trans(ib_link, &trans TSRMLS_CC) == FAILURE) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &link)) {
RETURN_FALSE;
}
+
+ PHP_IBASE_LINK_TRANS(link, ib_link, trans);
ib_blob = (ibase_blob *) emalloc(sizeof(ibase_blob));
ib_blob->bl_handle = NULL;
@@ -228,56 +215,55 @@
Open blob for retrieving data parts */
PHP_FUNCTION(ibase_blob_open)
{
- zval **blob_arg, **link_arg;
- ibase_db_link *link;
+ char *blob_id;
+ int blob_id_len;
+ zval *link = NULL;
+ ibase_db_link *ib_link;
ibase_trans *trans = NULL;
ibase_blob *ib_blob;
RESET_ERRMSG;
switch (ZEND_NUM_ARGS()) {
-
+ default:
+ WRONG_PARAM_COUNT;
case 1:
- if (zend_get_parameters_ex(1, &blob_arg) != SUCCESS) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s",
&blob_id, &blob_id_len)) {
+ RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE2(link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
break;
case 2:
- if (zend_get_parameters_ex(2, &link_arg, &blob_arg) !=
SUCCESS) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(2 TSRMLS_CC, "rs", &link,
&blob_id, &blob_id_len)) {
+ RETURN_FALSE;
}
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU,
link_arg, &link, &trans);
break;
- default:
- WRONG_PARAM_COUNT;
}
-
- convert_to_string_ex(blob_arg);
+
+ PHP_IBASE_LINK_TRANS(link, ib_link, trans);
ib_blob = (ibase_blob *) emalloc(sizeof(ibase_blob));
ib_blob->bl_handle = NULL;
ib_blob->type = BLOB_OUTPUT;
- if (! _php_ibase_string_to_quad(Z_STRVAL_PP(blob_arg), &(ib_blob->bl_qd))) {
- _php_ibase_module_error("String is not a BLOB ID" TSRMLS_CC);
- efree(ib_blob);
- RETURN_FALSE;
- }
-
- /* open default transaction */
- if (_php_ibase_def_trans(link, &trans TSRMLS_CC) == FAILURE) {
- efree(ib_blob);
- RETURN_FALSE;
- }
+ 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);
+ break;
+ }
- if (isc_open_blob(IB_STATUS, &link->handle, &trans->handle,
&ib_blob->bl_handle, &ib_blob->bl_qd)) {
- _php_ibase_error(TSRMLS_C);
- efree(ib_blob);
- RETURN_FALSE;
- }
+ if (isc_open_blob(IB_STATUS, &ib_link->handle, &trans->handle,
&ib_blob->bl_handle,
+ &ib_blob->bl_qd)) {
+ _php_ibase_error(TSRMLS_C);
+ break;
+ }
- ZEND_REGISTER_RESOURCE(return_value, ib_blob, le_blob);
+ ZEND_REGISTER_RESOURCE(return_value, ib_blob, le_blob);
+ return;
+
+ } while (0);
+
+ efree(ib_blob);
+ RETURN_FALSE;
}
/* }}} */
@@ -365,7 +351,7 @@
RETURN_FALSE;
}
ib_blob->bl_handle = NULL;
- RETVAL_BOOL(1);
+ RETVAL_TRUE;
}
zend_list_delete(Z_LVAL_PP(blob_arg));
}
@@ -391,46 +377,41 @@
Return blob length and other useful info */
PHP_FUNCTION(ibase_blob_info)
{
- zval **blob_arg, **link_arg;
- ibase_db_link *link;
+ char *blob_id;
+ int blob_id_len;
+ zval *link = NULL;
+ ibase_db_link *ib_link;
ibase_trans *trans = NULL;
- ibase_blob ib_blob = { NULL, { 0, 0 }, BLOB_INPUT };
+ ibase_blob ib_blob = { NULL, BLOB_INPUT };
IBASE_BLOBINFO bl_info;
RESET_ERRMSG;
switch (ZEND_NUM_ARGS()) {
-
+ default:
+ WRONG_PARAM_COUNT;
case 1:
- if (zend_get_parameters_ex(1, &blob_arg) != SUCCESS) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s",
&blob_id, &blob_id_len)) {
+ RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE2(link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
break;
case 2:
- if (zend_get_parameters_ex(2, &link_arg, &blob_arg) !=
SUCCESS) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(2 TSRMLS_CC, "rs", &link,
&blob_id, &blob_id_len)) {
+ RETURN_FALSE;
}
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU,
link_arg, &link, &trans);
break;
- default:
- WRONG_PARAM_COUNT;
}
- convert_to_string_ex(blob_arg);
+ PHP_IBASE_LINK_TRANS(link, ib_link, trans);
- if (! _php_ibase_string_to_quad(Z_STRVAL_PP(blob_arg), &(ib_blob.bl_qd))) {
+ if (! _php_ibase_string_to_quad(blob_id, &ib_blob.bl_qd)) {
_php_ibase_module_error("Unrecognized BLOB ID" TSRMLS_CC);
RETURN_FALSE;
}
- /* open default transaction */
- if (_php_ibase_def_trans(link, &trans TSRMLS_CC) == FAILURE) {
- 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, &link->handle, &trans->handle,
&ib_blob.bl_handle, &ib_blob.bl_qd)) {
+ if (isc_open_blob(IB_STATUS, &ib_link->handle, &trans->handle,
&ib_blob.bl_handle,
+ &ib_blob.bl_qd)) {
_php_ibase_error(TSRMLS_C);
RETURN_FALSE;
}
@@ -472,75 +453,73 @@
Output blob contents to browser */
PHP_FUNCTION(ibase_blob_echo)
{
- zval **blob_arg, **link_arg;
- ibase_db_link *link;
+ char *blob_id;
+ int blob_id_len;
+ zval *link = NULL;
+ ibase_db_link *ib_link;
ibase_trans *trans = NULL;
- ibase_blob ib_blob_id = { NULL, { 0, 0 }, BLOB_OUTPUT };
+ ibase_blob ib_blob_id = { NULL, BLOB_OUTPUT };
char bl_data[IBASE_BLOB_SEG];
unsigned short seg_len;
RESET_ERRMSG;
switch (ZEND_NUM_ARGS()) {
-
+ default:
+ WRONG_PARAM_COUNT;
case 1:
- if (zend_get_parameters_ex(1, &blob_arg) != SUCCESS) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s",
&blob_id, &blob_id_len)) {
+ RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE2(link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
break;
case 2:
- if (zend_get_parameters_ex(2, &link_arg, &blob_arg) !=
SUCCESS) {
- WRONG_PARAM_COUNT;
+ if (FAILURE == zend_parse_parameters(2 TSRMLS_CC, "rs", &link,
&blob_id, &blob_id_len)) {
+ RETURN_FALSE;
}
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU,
link_arg, &link, &trans);
break;
- default:
- WRONG_PARAM_COUNT;
}
- convert_to_string_ex(blob_arg);
+ PHP_IBASE_LINK_TRANS(link, ib_link, trans);
- if (! _php_ibase_string_to_quad(Z_STRVAL_PP(blob_arg), &(ib_blob_id.bl_qd))) {
+ if (! _php_ibase_string_to_quad(blob_id, &ib_blob_id.bl_qd)) {
_php_ibase_module_error("Unrecognized BLOB ID" TSRMLS_CC);
RETURN_FALSE;
}
- /* open default transaction */
- if (_php_ibase_def_trans(link, &trans TSRMLS_CC) == FAILURE) {
- RETURN_FALSE;
- }
-
- if (isc_open_blob(IB_STATUS, &link->handle, &trans->handle,
&ib_blob_id.bl_handle, &ib_blob_id.bl_qd)) {
- _php_ibase_error(TSRMLS_C);
- RETURN_FALSE;
- }
-
- while (!isc_get_segment(IB_STATUS, &ib_blob_id.bl_handle, &seg_len,
sizeof(bl_data), bl_data) || IB_STATUS[1] == isc_segment) {
- PHPWRITE(bl_data, seg_len);
- }
-
- if (IB_STATUS[0] && (IB_STATUS[1] != isc_segstr_eof)) {
- _php_ibase_error(TSRMLS_C);
- RETURN_FALSE;
- }
+ do {
+ if (isc_open_blob(IB_STATUS, &ib_link->handle, &trans->handle,
&ib_blob_id.bl_handle,
+ &ib_blob_id.bl_qd)) {
+ break;
+ }
+
+ while (!isc_get_segment(IB_STATUS, &ib_blob_id.bl_handle, &seg_len,
sizeof(bl_data), bl_data)
+ || IB_STATUS[1] == isc_segment) {
+ PHPWRITE(bl_data, seg_len);
+ }
+
+ if (IB_STATUS[0] && (IB_STATUS[1] != isc_segstr_eof)) {
+ break;
+ }
+
+ if (isc_close_blob(IB_STATUS, &ib_blob_id.bl_handle)) {
+ break;
+ }
+ RETURN_TRUE;
+ } while (0);
- if (isc_close_blob(IB_STATUS, &ib_blob_id.bl_handle)) {
- _php_ibase_error(TSRMLS_C);
- RETURN_FALSE;
- }
- RETURN_TRUE;
+ _php_ibase_error(TSRMLS_C);
+ RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string ibase_blob_import([resource link_identifier, ] int file_id)
+/* {{{ proto string ibase_blob_import([ resource link_identifier, ] resource file)
Create blob, copy file in it, and close it */
PHP_FUNCTION(ibase_blob_import)
{
- zval **link_arg, **file_arg;
- int link_id = 0, size;
+ zval *link = NULL, *file;
+ int size;
unsigned short b;
- ibase_blob ib_blob = { NULL, { 0, 0 }, 0 };
+ ibase_blob ib_blob = { NULL, 0 };
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
char bl_data[IBASE_BLOB_SEG];
@@ -548,53 +527,35 @@
RESET_ERRMSG;
- switch (ZEND_NUM_ARGS()) {
- case 1:
- if (zend_get_parameters_ex(1, &file_arg) == FAILURE) {
- RETURN_FALSE;
- }
- link_id = IBG(default_link);
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, link_id,
"InterBase link", le_link, le_plink);
- break;
- case 2:
- if (zend_get_parameters_ex(2, &link_arg, &file_arg) ==
FAILURE) {
- RETURN_FALSE;
- }
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU,
link_arg, &ib_link, &trans);
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
-
- /* open default transaction */
- if (_php_ibase_def_trans(ib_link, &trans TSRMLS_CC) == FAILURE) {
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|r",
+ (ZEND_NUM_ARGS()-1) ? &link : &file, &file)) {
RETURN_FALSE;
}
-
- php_stream_from_zval(stream, file_arg);
- if (isc_create_blob(IB_STATUS, &ib_link->handle, &trans->handle,
&ib_blob.bl_handle, &ib_blob.bl_qd)) {
- _php_ibase_error(TSRMLS_C);
- RETURN_FALSE;
- }
+ PHP_IBASE_LINK_TRANS(link, ib_link, trans);
- size = 0;
-
- while ((b = php_stream_read(stream, bl_data, sizeof(bl_data))) > 0) {
- if (isc_put_segment(IB_STATUS, &ib_blob.bl_handle, b, bl_data)) {
- _php_ibase_error(TSRMLS_C);
- RETURN_FALSE;
+ php_stream_from_zval(stream, &file);
+
+ do {
+ if (isc_create_blob(IB_STATUS, &ib_link->handle, &trans->handle,
&ib_blob.bl_handle,
+ &ib_blob.bl_qd)) {
+ break;
}
- size += b;
- }
- if (isc_close_blob(IB_STATUS, &ib_blob.bl_handle)) {
- _php_ibase_error(TSRMLS_C);
- RETURN_FALSE;
- }
+ for (size = 0; (b = php_stream_read(stream, bl_data,
sizeof(bl_data))); size += b) {
+ if (isc_put_segment(IB_STATUS, &ib_blob.bl_handle, b,
bl_data)) {
+ break;
+ }
+ }
+
+ 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);
+ } while (0);
- RETURN_STRINGL( _php_ibase_quad_to_string(ib_blob.bl_qd), BLOB_ID_LEN, 0);
+ _php_ibase_error(TSRMLS_C);
+ RETURN_FALSE;
}
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_events.c?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/interbase/ibase_events.c
diff -u php-src/ext/interbase/ibase_events.c:1.4
php-src/ext/interbase/ibase_events.c:1.5
--- php-src/ext/interbase/ibase_events.c:1.4 Wed Feb 11 06:59:08 2004
+++ php-src/ext/interbase/ibase_events.c Tue Feb 17 07:53:53 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ibase_events.c,v 1.4 2004/02/11 11:59:08 abies Exp $ */
+/* $Id: ibase_events.c,v 1.5 2004/02/17 12:53:53 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -73,7 +73,7 @@
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[16];
ibase_db_link *ib_link;
char *event_buffer, *result_buffer, *events[15];
unsigned short i = 0, event_count = 0, buffer_size;
@@ -86,9 +86,7 @@
WRONG_PARAM_COUNT;
}
- args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
- efree(args);
RETURN_FALSE;
}
@@ -100,7 +98,6 @@
} else {
if (ZEND_NUM_ARGS() > 15) {
- efree(args);
WRONG_PARAM_COUNT;
}
@@ -119,7 +116,6 @@
if (isc_wait_for_event(IB_STATUS, &ib_link->handle, buffer_size, event_buffer,
result_buffer)) {
_php_ibase_error(TSRMLS_C);
_php_ibase_event_free(event_buffer,result_buffer);
- efree(args);
RETURN_FALSE;
}
@@ -129,7 +125,6 @@
if (occurred_event[i]) {
char *result = estrdup(events[i]);
_php_ibase_event_free(event_buffer,result_buffer);
- efree(args);
RETURN_STRING(result,0);
}
}
@@ -137,7 +132,6 @@
/* 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;
}
/* }}} */
@@ -150,52 +144,55 @@
/**
* The callback function is called when the event is first registered and when
the event
- * is cancelled. I consider this is a bug. By clearing event->callback, we
make sure
- * nothing happens if no event was actually posted.
+ * is cancelled. I consider this is a bug. By clearing event->callback first
and setting
+ * it to -1 later, we make sure nothing happens if no event was actually
posted.
*/
- if (event->callback != NULL) {
-
+ switch (event->state) {
unsigned short i;
unsigned long occurred_event[15];
zval event_name, link_id, return_value, *args[2];
- /* initialize at runtime to satisify picky compilers */
- 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);
-
- /* 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);
+ 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);
+
+ /* 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);
+ 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));
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));
- return 0;
- }
-
- if (Z_TYPE(return_value) == IS_BOOL && !Z_BVAL(return_value)) {
- return 0;
- }
- }
+
+ if (Z_TYPE(return_value) == IS_BOOL && !Z_BVAL(return_value)) {
+ event->state = DEAD;
+ break;
+ }
+ case NEW:
+ /* re-register the 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)) {
- /* re-register the 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(TSRMLS_C);
+ }
+ event->state = ACTIVE;
}
return 0;
}
@@ -211,23 +208,20 @@
* used to determine if the event handler should remain set.
*/
- zval ***args, **cb_arg;
+ zval **args[17], **cb_arg;
ibase_db_link *ib_link;
ibase_event *event;
- char *callback_name;
unsigned short i = 1, buffer_size;
int link_res_id;
RESET_ERRMSG;
/* no more than 15 events */
- if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 17) {
+ if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 17) {
WRONG_PARAM_COUNT;
}
- args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
- efree(args);
RETURN_FALSE;
}
@@ -246,7 +240,6 @@
} else {
if (ZEND_NUM_ARGS() > 16) {
- efree(args);
WRONG_PARAM_COUNT;
}
@@ -258,14 +251,11 @@
}
/* get the callback */
- if (!zend_is_callable(*cb_arg, 0, &callback_name)) {
+ if (!zend_is_callable(*cb_arg, 0, NULL)) {
_php_ibase_module_error("Callback argument %s is not a callable
function"
- TSRMLS_CC, callback_name);
- efree(callback_name);
- efree(args);
+ TSRMLS_CC, Z_STRVAL_PP(cb_arg));
RETURN_FALSE;
}
- efree(callback_name);
/* allocate the event resource */
event = (ibase_event *) safe_emalloc(sizeof(ibase_event), 1, 0);
@@ -273,8 +263,13 @@
event->link_res_id = link_res_id;
event->link = ib_link;
event->event_count = 0;
- event->callback = NULL;
+ 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);
for (; i < ZEND_NUM_ARGS(); ++i) {
convert_to_string_ex(args[i]);
@@ -290,18 +285,13 @@
event->event_buffer,(isc_callback)_php_ibase_callback, (void *)event))
{
_php_ibase_error(TSRMLS_C);
- efree(args);
efree(event);
RETURN_FALSE;
}
-
- ALLOC_ZVAL(event->callback);
- *event->callback = **cb_arg;
- INIT_PZVAL(event->callback);
- zval_copy_ctor(event->callback);
- efree(args);
-
+ 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));
}
@@ -311,18 +301,22 @@
Frees the event handler set by ibase_set_event_handler() */
PHP_FUNCTION(ibase_free_event_handler)
{
- zval **event_arg;
- ibase_event *event;
+ zval *event_arg;
RESET_ERRMSG;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &event_arg) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
&event_arg)) {
+ ibase_event *event;
- ZEND_FETCH_RESOURCE(event, ibase_event *, event_arg, -1, "Interbase event",
le_event);
- zend_list_delete(Z_LVAL_PP(event_arg));
- RETURN_TRUE;
+ ZEND_FETCH_RESOURCE(event, ibase_event *, &event_arg, -1, "Interbase
event", le_event);
+
+ event->state = DEAD;
+
+ zend_list_delete(Z_LVAL_P(event_arg));
+ RETURN_TRUE;
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.201&r2=1.202&ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.201 php-src/ext/interbase/interbase.c:1.202
--- php-src/ext/interbase/interbase.c:1.201 Sun Feb 15 13:34:46 2004
+++ php-src/ext/interbase/interbase.c Tue Feb 17 07:53:53 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.201 2004/02/15 18:34:46 abies Exp $ */
+/* $Id: interbase.c,v 1.202 2004/02/17 12:53:53 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -30,7 +30,7 @@
#include "php.h"
-#define FILE_REVISION "$Revision: 1.201 $"
+#define FILE_REVISION "$Revision: 1.202 $"
#if HAVE_IBASE
@@ -266,8 +266,8 @@
/* }}} */
/* 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) /* {{{ */
+void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, /* {{{ */
+ zval **link_id, ibase_db_link **ib_link, ibase_trans **trans)
{
int type;
@@ -279,7 +279,8 @@
IBDEBUG("Type is le_trans");
ZEND_FETCH_RESOURCE(*trans, ibase_trans *, link_id, -1,
"InterBase transaction", le_trans);
if ((*trans)->link_cnt > 1) {
- _php_ibase_module_error("Link id is ambiguous:
transaction spans multiple connections." TSRMLS_CC);
+ _php_ibase_module_error("Link id is ambiguous:
transaction spans multiple connections."
+ TSRMLS_CC);
return;
}
*ib_link = (*trans)->db_link[0];
@@ -315,10 +316,56 @@
}
/* }}} */
+static void _php_ibase_free_event(ibase_event *event TSRMLS_DC) /* {{{ */
+{
+ unsigned short i;
+
+ event->state = DEAD;
+
+ if (event->link != NULL) {
+ ibase_event **node;
+
+ if (event->link->handle != NULL &&
+ isc_cancel_events(IB_STATUS, &event->link->handle,
&event->event_id)) {
+ _php_ibase_error(TSRMLS_C);
+ }
+
+ /* delete this event from the link struct */
+ for (node = &event->link->event_head; *node != event; node =
&(*node)->event_next);
+ *node = event->event_next;
+ }
+
+ if (event->callback) {
+ zval_dtor(event->callback);
+ FREE_ZVAL(event->callback);
+ event->callback = NULL;
+
+ _php_ibase_event_free(event->event_buffer,event->result_buffer);
+
+ for (i = 0; i < event->event_count; ++i) {
+ efree(event->events[i]);
+ }
+ efree(event->events);
+ }
+}
+/* }}} */
+
+static void _php_ibase_free_event_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+{
+ ibase_event *e = (ibase_event *) rsrc->ptr;
+ IBDEBUG("Cleaning up event resource");
+
+ _php_ibase_free_event(e TSRMLS_CC);
+
+ efree(e);
+}
+/* }}} */
+
static void _php_ibase_commit_link(ibase_db_link *link TSRMLS_DC) /* {{{ */
{
unsigned short i = 0, j;
ibase_tr_list *l;
+ ibase_event *e;
IBDEBUG("Checking transactions to close...");
for (l = link->tr_list; l != NULL; ++i) {
@@ -335,7 +382,7 @@
}
else {
if (p->trans->handle != NULL) {
- /* non-default transaction might have been
rolled back by other call of this dtor */
+ /* 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);
@@ -354,7 +401,13 @@
efree(p);
}
link->tr_list = NULL;
+
+ for (e = link->event_head; e; e = e->event_next) {
+ _php_ibase_free_event(e TSRMLS_CC);
+ e->link = NULL;
+ }
}
+
/* }}} */
static void php_ibase_commit_link_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
@@ -500,24 +553,6 @@
}
/* }}} */
-static void _php_ibase_free_event(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
-{
- ibase_event *event = (ibase_event *) rsrc->ptr;
-
- IBDEBUG("Cleaning up event resource");
-
- zval_dtor(event->callback);
- event->callback = NULL;
-
- if (event->link->handle != NULL) {
- if (isc_cancel_events(IB_STATUS, &event->link->handle,
&event->event_id)) {
- _php_ibase_error(TSRMLS_C);
- }
- }
- _php_ibase_event_free(event->event_buffer,event->result_buffer);
-}
-/* }}} */
-
#if HAVE_IBASE6_API
static void _php_ibase_free_service(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
{
@@ -574,7 +609,7 @@
le_link = zend_register_list_destructors_ex(_php_ibase_close_link, NULL,
"interbase link", module_number);
le_plink = zend_register_list_destructors_ex(php_ibase_commit_link_rsrc,
_php_ibase_close_plink, "interbase link persistent", module_number);
le_trans = zend_register_list_destructors_ex(_php_ibase_free_trans, NULL,
"interbase transaction", module_number);
- le_event = zend_register_list_destructors_ex(_php_ibase_free_event, NULL,
"interbase event", module_number);
+ le_event = zend_register_list_destructors_ex(_php_ibase_free_event_rsrc, NULL,
"interbase event", module_number);
#if HAVE_IBASE6_API
le_service = zend_register_list_destructors_ex(_php_ibase_free_service, NULL,
"interbase service manager handle", module_number);
#endif
@@ -752,7 +787,7 @@
#if defined(__GNUC__) || defined(PHP_WIN32)
do {
#ifdef __GNUC__
- void (*info_func)(char*) = dlsym(RTLD_DEFAULT,
"isc_get_client_version");
+ void (*info_func)(char*) = (void(*)(char*))dlsym(RTLD_DEFAULT,
"isc_get_client_version");
#else
void (__stdcall *info_func)(char*);
@@ -804,8 +839,8 @@
}
/* }}} */
-int _php_ibase_attach_db(char *server, char *uname, char *passwd, char *charset,
- int buffers, char *role, isc_db_handle *db TSRMLS_DC) /* {{{ */
+int _php_ibase_attach_db(char *server, char *uname, char *passwd, char *charset, /*
{{{ */
+ int buffers, char *role, isc_db_handle *db TSRMLS_DC)
{
char dpb_buffer[256], *dpb, *p;
int dpb_length, len;
@@ -867,7 +902,7 @@
static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* {{{ */
{
- zval ***args;
+ zval **args[7];
char *ib_server = NULL, *ib_uname, *ib_passwd, *ib_charset = NULL, *ib_buffers
= NULL,
*ib_dialect = NULL, *ib_role = NULL;
unsigned short sql_dialect = SQL_DIALECT_CURRENT;
@@ -888,9 +923,7 @@
WRONG_PARAM_COUNT;
}
- args = (zval ***) safe_emalloc(sizeof(zval **), ZEND_NUM_ARGS(), 0);
if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
- efree(args);
RETURN_FALSE;
}
@@ -937,8 +970,6 @@
hashed_details_length += Z_STRLEN_PP(args[0]);
} /* case */
- efree(args);
-
hashed_details = (char *)emalloc(hashed_details_length+sizeof(HASH_MASK)+1);
sprintf(hashed_details, HASH_MASK, SAFE_STRING(ib_server),
SAFE_STRING(ib_uname),
SAFE_STRING(ib_passwd), SAFE_STRING(ib_charset),
SAFE_STRING(ib_buffers),
@@ -993,6 +1024,7 @@
ib_link->handle = db_handle;
ib_link->dialect = sql_dialect;
ib_link->tr_list = NULL;
+ ib_link->event_head = NULL;
/* hash it up */
Z_TYPE(new_le) = le_plink;
@@ -1057,6 +1089,7 @@
ib_link->handle = db_handle;
ib_link->dialect = sql_dialect;
ib_link->tr_list = NULL;
+ ib_link->event_head = NULL;
ZEND_REGISTER_RESOURCE(return_value, ib_link, le_link);
@@ -1171,8 +1204,8 @@
}
/* }}} */
-static int _php_ibase_alloc_array(ibase_array **ib_arrayp, XSQLDA *sqlda,
- isc_db_handle link, isc_tr_handle trans TSRMLS_DC) /* {{{ */
+static int _php_ibase_alloc_array(ibase_array **ib_arrayp, XSQLDA *sqlda, /* {{{ */
+ isc_db_handle link, isc_tr_handle trans TSRMLS_DC)
{
#define IB_ARRAY (*ib_arrayp)
@@ -1285,8 +1318,8 @@
/* }}} */
/* 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) /* {{{ */
+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)
{
static char info_type[] = {isc_info_sql_stmt_type};
char result[8];
@@ -1394,8 +1427,8 @@
}
/* }}} */
-static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size,
- ibase_array *array, int dim TSRMLS_DC) /* {{{ */
+static int _php_ibase_bind_array(zval *val, char *buf, unsigned long buf_size, /* {{{
*/
+ ibase_array *array, int dim TSRMLS_DC)
{
zval null_val, *pnull_val = &null_val;
int u_bound = array->ar_desc.array_desc_bounds[dim].array_bound_upper,
@@ -1558,8 +1591,8 @@
&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));
+ _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));
return FAILURE;
}
t.tm_year -= 1900;
@@ -1747,7 +1780,7 @@
if (Z_STRLEN_P(b_var) != BLOB_ID_LEN ||
!_php_ibase_string_to_quad(Z_STRVAL_P(b_var), &buf[i].val.qval)) {
- ibase_blob ib_blob = { NULL, {0, 0},
BLOB_INPUT };
+ ibase_blob ib_blob = { NULL,
BLOB_INPUT };
if (isc_create_blob(IB_STATUS,
&ib_query->link->handle,
&ib_query->trans->handle, &ib_blob.bl_handle, &ib_blob.bl_qd)) {
@@ -1785,7 +1818,8 @@
if (_php_ibase_bind_array(b_var,
array_data, ib_query->in_array[i].ar_size,
&ib_query->in_array[i], 0
TSRMLS_CC) == FAILURE)
{
-
_php_ibase_module_error("Parameter %d: failed to bind array argument" TSRMLS_CC,i+1);
+
_php_ibase_module_error("Parameter %d: failed to bind array argument"
+ TSRMLS_CC,i+1);
efree(array_data);
rv = FAILURE;
break;
@@ -1820,8 +1854,7 @@
}
/* }}} */
-/* {{{ _php_ibase_alloc_xsqlda() */
-static void _php_ibase_alloc_xsqlda(XSQLDA *sqlda)
+static void _php_ibase_alloc_xsqlda(XSQLDA *sqlda) /* {{{ */
{
int i;
XSQLVAR *var = sqlda->sqlvar;
@@ -1879,8 +1912,8 @@
}
/* }}} */
-static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resultp,
- ibase_query *ib_query, int argc, zval **args) /* {{{ */
+static int _php_ibase_exec(INTERNAL_FUNCTION_PARAMETERS, ibase_result **ib_resultp,
/* {{{ */
+ ibase_query *ib_query, int argc, zval **args)
{
#define IB_RESULT (*ib_resultp)
XSQLDA *in_sqlda = NULL, *out_sqlda = NULL;
@@ -2107,7 +2140,8 @@
if (Z_TYPE_PP(args[i]) == IS_RESOURCE) {
- ZEND_FETCH_RESOURCE2(ib_link[link_cnt], ibase_db_link
*, args[i], -1, "InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link[link_cnt], ibase_db_link
*, args[i], -1,
+ "InterBase link", le_link, le_plink);
/* copy the most recent modifier string into tbp[] */
memcpy(&tpb[TPB_MAX_SIZE * link_cnt], last_tpb,
TPB_MAX_SIZE);
@@ -2171,7 +2205,8 @@
if (link_cnt == 0) {
link_cnt = 1;
- ZEND_FETCH_RESOURCE2(ib_link[0], ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link[0], ibase_db_link *, NULL,
IBG(default_link), "InterBase link",
+ le_link, le_plink);
result = isc_start_transaction(IB_STATUS, &tr_handle, 1,
&ib_link[0]->handle, tpb_len, last_tpb);
}
@@ -2260,7 +2295,8 @@
zval **arg;
case 0:
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase 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);
@@ -2280,7 +2316,8 @@
res_id = Z_LVAL_PP(arg);
} else {
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, arg,
-1, "InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, arg,
-1, "InterBase 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 */
@@ -2409,7 +2446,8 @@
isc_db_handle db = NULL;
isc_tr_handle trans = NULL;
- if (isc_dsql_execute_immediate(IB_STATUS, &db, &trans,
0, query, SQL_DIALECT_CURRENT, NULL)) {
+ if (isc_dsql_execute_immediate(IB_STATUS, &db, &trans,
0, query,
+ SQL_DIALECT_CURRENT, NULL)) {
_php_ibase_error(TSRMLS_C);
free_alloca(args);
RETURN_FALSE;
@@ -2447,7 +2485,8 @@
RETURN_TRUE;
}
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link",
+ le_link, le_plink);
break;
case 2:
/* one id was passed, could be db or trans id */
@@ -2461,7 +2500,8 @@
break;
case 3:
/* two ids were passed, first should be link and second should
be trans; */
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link*, args[0], -1,
"InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link*, args[0], -1,
"InterBase link",
+ le_link, le_plink);
ZEND_FETCH_RESOURCE(trans, ibase_trans*, args[1], -1,
"InterBase transaction", le_trans);
convert_to_long_ex(args[1]);
@@ -2490,12 +2530,14 @@
RETURN_FALSE;
}
- if (_php_ibase_alloc_query(&ib_query, ib_link, trans, query, ib_link->dialect,
trans_res_id TSRMLS_CC) == FAILURE) {
+ if (FAILURE == _php_ibase_alloc_query(&ib_query, ib_link, trans, query,
ib_link->dialect,
+ trans_res_id TSRMLS_CC)) {
free_alloca(args);
RETURN_FALSE;
}
- if (_php_ibase_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, &result, &ib_query,
bind_n, bind_args) == FAILURE) {
+ if (FAILURE == _php_ibase_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, &result,
&ib_query,
+ bind_n, bind_args)) {
_php_ibase_free_query(&ib_query TSRMLS_CC);
free_alloca(args);
RETURN_FALSE;
@@ -2530,7 +2572,8 @@
zval **arg;
case 0:
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link",
+ le_link, le_plink);
if (ib_link->tr_list == NULL || ib_link->tr_list->trans ==
NULL) {
RETURN_FALSE;
}
@@ -2544,7 +2587,8 @@
/* one id was passed, could be db or trans id */
_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, "InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, arg,
-1, "InterBase link",
+ le_link, le_plink);
if (ib_link->tr_list == NULL ||
ib_link->tr_list->trans == NULL) {
RETURN_FALSE;
@@ -2567,9 +2611,6 @@
PHP_FUNCTION(ibase_num_rows)
{
/**
- * PLEASE READ THIS FIRST before adding this function to the main PHP
- * documentation:
- *
* 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
* releases of Firebird), this function is fairly useless. I'm leaving it
@@ -2604,7 +2645,8 @@
ZEND_FETCH_RESOURCE(ib_result, ibase_result *, result_arg, -1, "InterBase
result", le_result);
- if (isc_dsql_sql_info(IB_STATUS, &ib_result->stmt, sizeof(info_count),
info_count, sizeof(result), result)) {
+ if (isc_dsql_sql_info(IB_STATUS, &ib_result->stmt, sizeof(info_count),
info_count,
+ sizeof(result), result)) {
_php_ibase_error(TSRMLS_C);
RETURN_FALSE;
}
@@ -2624,15 +2666,16 @@
#endif
/* }}} */
-static int _php_ibase_var_zval(zval *val, void *data, int type, int len, int scale,
- int flag TSRMLS_DC) /* {{{ */
+static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{ */
+ int scale, int flag TSRMLS_DC)
{
#ifdef SQL_INT64
static ISC_INT64 const scales[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
100000000, 1000000000,
1000000000,
LL_LIT(10000000000),LL_LIT(100000000000),LL_LIT(10000000000000),LL_LIT(100000000000000),
LL_LIT(1000000000000000),LL_LIT(1000000000000000),LL_LIT(1000000000000000000) };
#else
- static long const scales[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
100000000, 1000000000, 1000000000 };
+ static long const scales[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
100000000, 1000000000,
+ 1000000000 };
#endif
switch (type & ~1) {
@@ -2743,11 +2786,12 @@
#else
switch (type & ~1) {
default:
- l = sprintf(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);
+ l = sprintf(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;
#ifdef SQL_TIMESTAMP
case SQL_TYPE_DATE:
- l = sprintf(string_data,
"%02d/%02d/%4d", t.tm_mon + 1, t.tm_mday, t.tm_year + 1900);
+ l = sprintf(string_data,
"%02d/%02d/%4d", t.tm_mon + 1, t.tm_mday, t.tm_year+1900);
break;
case SQL_TYPE_TIME:
l = sprintf(string_data,
"%02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
@@ -2764,8 +2808,8 @@
}
/* }}} */
-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) /* {{{ */
+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)
{
/**
* Create multidimension array - recursion function
@@ -2787,7 +2831,8 @@
ALLOC_INIT_ZVAL(slice_zval);
/* recursion here */
- if (_php_ibase_arr_zval(slice_zval, data, slice_size,
ib_array, dim + 1, flag TSRMLS_CC) == FAILURE) {
+ if (FAILURE == _php_ibase_arr_zval(slice_zval, data,
slice_size, ib_array, dim + 1,
+ flag TSRMLS_CC)) {
return FAILURE;
}
data += slice_size;
@@ -2874,7 +2919,8 @@
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 TSRMLS_CC);
break;
case SQL_BLOB:
if (flag & PHP_IBASE_FETCH_BLOBS) { /* fetch
blob contents into hash */
@@ -2888,12 +2934,14 @@
blob_handle.bl_handle = NULL;
blob_handle.bl_qd = *(ISC_QUAD *)
var->sqldata;
- if (isc_open_blob(IB_STATUS,
&ib_result->link->handle, &ib_result->trans->handle, &blob_handle.bl_handle,
&blob_handle.bl_qd)) {
+ 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);
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)) {
+ 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);
goto _php_ibase_fetch_error;
}
@@ -2906,7 +2954,8 @@
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);
+
_php_ibase_module_error("Could not determine BLOB size (internal error)"
+ TSRMLS_CC);
goto
_php_ibase_fetch_error;
}
@@ -2921,7 +2970,8 @@
if (max_len == 0) {
ZVAL_STRING(result, "", 1);
- } else if (_php_ibase_blob_get(result,
&blob_handle, max_len TSRMLS_CC) != SUCCESS) {
+ } else if (SUCCESS !=
_php_ibase_blob_get(result, &blob_handle,
+ max_len TSRMLS_CC)) {
goto _php_ibase_fetch_error;
}
@@ -2941,13 +2991,16 @@
ibase_array *ib_array =
&ib_result->out_array[i];
void *ar_data =
emalloc(ib_array->ar_size);
- 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)) {
+ 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);
efree(ar_data);
goto _php_ibase_fetch_error;
}
- if (_php_ibase_arr_zval(result,
ar_data, ib_array->ar_size, ib_array, 0, flag TSRMLS_CC) == FAILURE) {
+ if (FAILURE ==
_php_ibase_arr_zval(result, ar_data, ib_array->ar_size, ib_array,
+ 0, flag TSRMLS_CC)) {
efree(ar_data);
goto _php_ibase_fetch_error;
}
@@ -3071,7 +3124,8 @@
if (zend_get_parameters_ex(1, &query_arg) == FAILURE) {
RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link",
+ le_link, le_plink);
break;
case 2:
if (zend_get_parameters_ex(2, &link_arg, &query_arg) ==
FAILURE) {
@@ -3089,7 +3143,8 @@
if (zend_get_parameters_ex(3, &link_arg, &trans_arg,
&query_arg) == FAILURE) {
RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link*, link_arg, -1,
"InterBase link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link*, link_arg, -1,
"InterBase link",
+ le_link, le_plink);
ZEND_FETCH_RESOURCE(trans, ibase_trans*, trans_arg, -1,
"InterBase transaction", le_trans);
convert_to_long_ex(trans_arg);
@@ -3104,14 +3159,14 @@
convert_to_string_ex(query_arg);
query = Z_STRVAL_PP(query_arg);
- /* open default transaction */
- if (_php_ibase_def_trans(ib_link, &trans TSRMLS_CC) == FAILURE) {
+ if (FAILURE == _php_ibase_def_trans(ib_link, &trans TSRMLS_CC)) {
RETURN_FALSE;
}
ib_query = (ibase_query *) emalloc(sizeof(ibase_query));
- if (_php_ibase_alloc_query(ib_query, ib_link, trans, query, ib_link->dialect,
trans_res_id TSRMLS_CC) == FAILURE) {
+ if (FAILURE == _php_ibase_alloc_query(ib_query, ib_link, trans, query,
ib_link->dialect,
+ trans_res_id TSRMLS_CC)) {
efree(ib_query);
RETURN_FALSE;
}
@@ -3156,7 +3211,8 @@
zend_list_delete(ib_query->result_res_id);
}
- if (_php_ibase_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, &result, ib_query,
ZEND_NUM_ARGS() - 1, bind_args) == FAILURE) {
+ if (FAILURE == _php_ibase_exec(INTERNAL_FUNCTION_PARAM_PASSTHRU, &result,
ib_query,
+ ZEND_NUM_ARGS()-1, bind_args)) {
free_alloca(args);
RETURN_FALSE;
}
@@ -3480,78 +3536,30 @@
}
/* }}} */
-
-/* {{{ proto int ibase_gen_id([ resource link_identifier, ] string generator [, int
increment ])
+/* {{{ proto int ibase_gen_id(string generator [, int increment [, resource
link_identifier ]])
Increments the named generator and returns its new value */
PHP_FUNCTION(ibase_gen_id)
{
- char query[128];
-
- zval **arg1, **arg2, **arg3, **query_arg;
+ zval *link = NULL;
+ char query[128], *generator;
+ long gen_len, inc = 1;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
- long increment;
+ XSQLDA out_sqlda;
#ifdef SQL_INT64
ISC_INT64 result;
#else
ISC_LONG result;
#endif
- XSQLDA out_sqlda;
-
RESET_ERRMSG;
- switch (ZEND_NUM_ARGS()) {
- case 1:
- if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
- RETURN_FALSE;
- }
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
- query_arg = arg1;
- increment = 1;
- break;
- case 2:
- if (zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
- RETURN_FALSE;
- }
-
- if (Z_TYPE_PP(arg1) == IS_STRING) /* first param is generator,
second is inc */
- {
- query_arg = arg1;
- convert_to_long_ex(arg2);
- increment = Z_LVAL_PP(arg2);
+ zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lr", &generator, &gen_len,
&inc, &link);
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), "InterBase link", le_link, le_plink);
- } else {
-
_php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, arg1, &ib_link, &trans);
- query_arg = arg2;
- increment = 1;
- }
- break;
- case 3:
- if (zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE)
{
- RETURN_FALSE;
- }
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link*, arg1, -1,
"InterBase link", le_link, le_plink);
-
- query_arg = arg2;
- convert_to_long_ex(arg3);
- increment = Z_LVAL_PP(arg3);
-
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
+ PHP_IBASE_LINK_TRANS(link, ib_link, trans);
- convert_to_string_ex(query_arg);
- sprintf(query, "SELECT GEN_ID(%s,%ld) FROM rdb$database",
Z_STRVAL_PP(query_arg), increment);
+ sprintf(query, "SELECT GEN_ID(%s,%ld) FROM rdb$database", generator, inc);
- /* open default transaction */
- if (_php_ibase_def_trans(ib_link, &trans TSRMLS_CC) == FAILURE) {
- RETURN_FALSE;
- }
-
/* allocate a minimal descriptor area */
out_sqlda.sqln = out_sqlda.sqld = 1;
out_sqlda.version = SQLDA_CURRENT_VERSION;
@@ -3567,19 +3575,18 @@
out_sqlda.sqlvar[0].sqldata = (void*) &result;
/* execute the query */
- if (isc_dsql_exec_immed2(IB_STATUS, &ib_link->handle, &trans->handle, 0,
query, SQL_DIALECT_CURRENT, NULL, &out_sqlda))
- {
+ 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);
RETURN_FALSE;
}
/* don't return the generator value as a string unless it doesn't fit in a
long */
#ifdef SQL_INT64
- if (result > LONG_MAX)
- {
+ if (result < LONG_MIN || result > LONG_MAX) {
char res[24];
- sprintf(res,"%" LL_MASK "d", result);
+ sprintf(res, "%" LL_MASK "d", result);
RETURN_STRING(res,1);
}
#endif
http://cvs.php.net/diff.php/php-src/ext/interbase/php_ibase_includes.h?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/interbase/php_ibase_includes.h
diff -u php-src/ext/interbase/php_ibase_includes.h:1.1
php-src/ext/interbase/php_ibase_includes.h:1.2
--- php-src/ext/interbase/php_ibase_includes.h:1.1 Mon Feb 2 08:47:56 2004
+++ php-src/ext/interbase/php_ibase_includes.h Tue Feb 17 07:53:53 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ibase_includes.h,v 1.1 2004/02/02 13:47:56 abies Exp $ */
+/* $Id: php_ibase_includes.h,v 1.2 2004/02/17 12:53:53 abies Exp $ */
#ifndef INTERBASE_H
#define INTERBASE_H
@@ -78,6 +78,7 @@
isc_db_handle handle;
struct tr_list *tr_list;
unsigned short dialect;
+ struct event *event_head;
} ibase_db_link;
typedef struct {
@@ -100,8 +101,8 @@
typedef struct {
isc_blob_handle bl_handle;
- ISC_QUAD bl_qd;
unsigned short type;
+ ISC_QUAD bl_qd;
} ibase_blob;
typedef struct {
@@ -127,7 +128,7 @@
long trans_res_id;
} ibase_query;
-typedef struct {
+typedef struct event {
ibase_db_link *link;
long link_res_id;
ISC_LONG event_id;
@@ -136,6 +137,8 @@
char *event_buffer, *result_buffer;
zval *callback;
void **thread_ctx;
+ struct event *event_next;
+ enum event_state { NEW, ACTIVE, DEAD } state;
} ibase_event;
typedef struct {
@@ -197,6 +200,16 @@
void _php_ibase_module_error(char * TSRMLS_DC, ...)
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) } \
+ 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; } \
+ } 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,
ibase_db_link **ib_link, ibase_trans **trans);
http://cvs.php.net/diff.php/php-src/ext/interbase/tests/004.phpt?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/interbase/tests/004.phpt
diff -u php-src/ext/interbase/tests/004.phpt:1.11
php-src/ext/interbase/tests/004.phpt:1.12
--- php-src/ext/interbase/tests/004.phpt:1.11 Tue Feb 17 07:24:42 2004
+++ php-src/ext/interbase/tests/004.phpt Tue Feb 17 07:53:54 2004
@@ -5,7 +5,7 @@
--POST--
--GET--
--FILE--
-<?php /* $Id: 004.phpt,v 1.11 2004/02/17 12:24:42 abies Exp $ */
+<?php /* $Id: 004.phpt,v 1.12 2004/02/17 12:53:54 abies Exp $ */
require("interbase.inc");
@@ -30,7 +30,7 @@
$bl_s = ibase_blob_import($ftmp);
ibase_query("INSERT INTO test4 (v_integer, v_blob) VALUES (1, ?)", $bl_s);
- $bl_s = ibase_blob_import($ftmp,$link);
+ $bl_s = ibase_blob_import($link,$ftmp);
ibase_query($link, "INSERT INTO test4 (v_integer, v_blob) VALUES (1, ?)", $bl_s);
echo "test blob 1\n";
@@ -46,7 +46,7 @@
echo " BLOB 1 fail (1)\n";
ibase_blob_close($bl_h);
- $bl_h = ibase_blob_open($row->V_BLOB,$link);
+ $bl_h = ibase_blob_open($link,$row->V_BLOB);
$blob = '';
while($piece = ibase_blob_get($bl_h, 100 * 1024))
@@ -111,7 +111,7 @@
ibase_close();
ibase_connect($test_base);
- ibase_blob_echo($row->V_BLOB, $link);
+ ibase_blob_echo($link, $row->V_BLOB);
ibase_free_result($q);
echo "fetch blob 3\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
