diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/sybase_ct/php_sybase_ct.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/sybase_ct/php_sybase_ct.c')
| -rw-r--r-- | ext/sybase_ct/php_sybase_ct.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index 97aa204892..12afe6f278 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -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); @@ -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; |