diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
| commit | c3e3c98ec666812daaaca896cf5ef758a8a6df14 (patch) | |
| tree | d82a76de5c8d117d1cf2dcca19bb30a283621870 /ext/interbase/ibase_events.c | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'ext/interbase/ibase_events.c')
| -rw-r--r-- | ext/interbase/ibase_events.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c index f8eb3b8521..150512faf4 100644 --- a/ext/interbase/ibase_events.c +++ b/ext/interbase/ibase_events.c @@ -178,7 +178,7 @@ 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]) { - zend_string *result = STR_INIT(events[i], strlen(events[i]), 0); + zend_string *result = zend_string_init(events[i], strlen(events[i]), 0); _php_ibase_event_free(event_buffer,result_buffer); efree(args); RETURN_STR(result); @@ -298,7 +298,7 @@ PHP_FUNCTION(ibase_set_event_handler) } convert_to_int_ex(&args[0]); - link_res_id = Z_IVAL(args[0]); + link_res_id = Z_LVAL(args[0]); } else { /* callback, event_1 [, ... event_15] @@ -319,10 +319,10 @@ PHP_FUNCTION(ibase_set_event_handler) /* 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->val); - STR_RELEASE(cb_name); + zend_string_release(cb_name); RETURN_FALSE; } - STR_RELEASE(cb_name); + zend_string_release(cb_name); /* allocate the event resource */ event = (ibase_event *) safe_emalloc(sizeof(ibase_event), 1, 0); |