diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-19 22:16:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-19 23:39:07 +0200 |
| commit | 37aaccad7d8b9428c69f8c03806e1635575f216b (patch) | |
| tree | 4c7ed96fb8f9082224df6c3420a3f1b589d4cc57 /sapi/cli/php_cli_server.c | |
| parent | 070667de8db929454aee13c5185b165554c00c55 (diff) | |
| download | php-git-37aaccad7d8b9428c69f8c03806e1635575f216b.tar.gz | |
Use inline functions for most of smart_str
smart_str_free_ex no longer exists, always use smart_str_free instead.
smart_str_alloc no longer requires a newlen variable to be in scope,
instead it returns the new length.
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index c60eaa2f8e..2d2e399ec8 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1908,7 +1908,7 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server chunk = php_cli_server_chunk_heap_new(buffer.s, buffer.s->val, buffer.s->len); if (!chunk) { - smart_str_free_ex(&buffer, 1); + smart_str_free(&buffer); goto fail; } php_cli_server_buffer_prepend(&client->content_sender.buffer, chunk); @@ -1998,7 +1998,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv smart_str_appendl_ex(&buffer, "\r\n", 2, 1); chunk = php_cli_server_chunk_heap_new(buffer.s, buffer.s->val, buffer.s->len); if (!chunk) { - smart_str_free_ex(&buffer, 1); + smart_str_free(&buffer); php_cli_server_log_response(client, 500, NULL TSRMLS_CC); return FAILURE; } |