diff options
Diffstat (limited to 'ext/sybase_ct/php_sybase_ct.c')
| -rw-r--r-- | ext/sybase_ct/php_sybase_ct.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index ee53d484cf..c079ff383d 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -281,8 +281,8 @@ static void _free_sybase_result(sybase_result *result) if (result->fields) { for (i=0; i<result->num_fields; i++) { - STR_FREE(result->fields[i].name); - STR_FREE(result->fields[i].column_source); + zend_string_free(result->fields[i].name); + zend_string_free(result->fields[i].column_source); } efree(result->fields); } @@ -390,7 +390,7 @@ static CS_RETCODE CS_PUBLIC _client_message_handler(CS_CONTEXT *context, CS_CONN if (CS_SEVERITY(errmsg->msgnumber) >= SybCtG(min_client_severity)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Client message: %s (severity %ld)", errmsg->msgstring, (long)CS_SEVERITY(errmsg->msgnumber)); } - STR_FREE(SybCtG(server_message)); + zend_string_free(SybCtG(server_message)); SybCtG(server_message) = estrdup(errmsg->msgstring); @@ -442,7 +442,7 @@ static int _call_message_handler(zval *callback_name, CS_SERVERMSG *srvmsg TSRML zval expr_copy; int use_copy; - zend_make_printable_zval(callback_name, &expr_copy, &use_copy); + use_copy = zend_make_printable_zval(callback_name, &expr_copy TSRMLS_CC); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Cannot call the messagehandler %s", Z_STRVAL(expr_copy)); zval_dtor(&expr_copy); } @@ -470,7 +470,7 @@ static CS_RETCODE CS_PUBLIC _server_message_handler(CS_CONTEXT *context, CS_CONN TSRMLS_FETCH(); /* Remember the last server message in any case */ - STR_FREE(SybCtG(server_message)); + zend_string_free(SybCtG(server_message)); SybCtG(server_message) = estrdup(srvmsg->text); /* Retrieve sybase link */ @@ -620,7 +620,7 @@ PHP_RSHUTDOWN_FUNCTION(sybase) zval_ptr_dtor(&SybCtG(callback_name)); SybCtG(callback_name)= NULL; } - STR_FREE(SybCtG(server_message)); + zend_string_free(SybCtG(server_message)); SybCtG(server_message) = NULL; return SUCCESS; } @@ -1426,7 +1426,7 @@ static void php_sybase_query (INTERNAL_FUNCTION_PARAMETERS, int buffered) zval *sybase_link_index = NULL; zend_bool store = 1; char *query; - int len, id, deadlock_count; + size_t len, id, deadlock_count; sybase_link *sybase_ptr; sybase_result *result; CS_INT restype; @@ -2001,11 +2001,11 @@ PHP_FUNCTION(sybase_fetch_field) object_init(return_value); - add_property_string(return_value, "name", result->fields[field_offset].name, 1); + add_property_string(return_value, "name", result->fields[field_offset].name); add_property_long(return_value, "max_length", result->fields[field_offset].max_length); - add_property_string(return_value, "column_source", result->fields[field_offset].column_source, 1); + add_property_string(return_value, "column_source", result->fields[field_offset].column_source); add_property_long(return_value, "numeric", result->fields[field_offset].numeric); - add_property_string(return_value, "type", php_sybase_get_field_name(Z_TYPE(result->fields[field_offset])), 1); + add_property_string(return_value, "type", php_sybase_get_field_name(Z_TYPE(result->fields[field_offset]))); } /* }}} */ |