From 33e97d465d9e38b74a261455ba83e2de991ab9f4 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 17 Nov 2015 12:31:30 +0100 Subject: mysqlnd refactoring: - move MYSQLND_READ_BUFFER to own file --- ext/mysqlnd/mysqlnd_read_buffer.c | 95 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 ext/mysqlnd/mysqlnd_read_buffer.c (limited to 'ext/mysqlnd/mysqlnd_read_buffer.c') diff --git a/ext/mysqlnd/mysqlnd_read_buffer.c b/ext/mysqlnd/mysqlnd_read_buffer.c new file mode 100644 index 0000000000..99cb321f3f --- /dev/null +++ b/ext/mysqlnd/mysqlnd_read_buffer.c @@ -0,0 +1,95 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2015 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 | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Andrey Hristov | + | Ulf Wendel | + +----------------------------------------------------------------------+ +*/ +#include "php.h" +#include "mysqlnd.h" +#include "mysqlnd_debug.h" +#include "mysqlnd_read_buffer.h" + + +/* {{{ mysqlnd_read_buffer_is_empty */ +static zend_bool +mysqlnd_read_buffer_is_empty(const MYSQLND_READ_BUFFER * const buffer) +{ + return buffer->len? FALSE:TRUE; +} +/* }}} */ + + +/* {{{ mysqlnd_read_buffer_read */ +static void +mysqlnd_read_buffer_read(MYSQLND_READ_BUFFER * buffer, const size_t count, zend_uchar * dest) +{ + if (buffer->len >= count) { + memcpy(dest, buffer->data + buffer->offset, count); + buffer->offset += count; + buffer->len -= count; + } +} +/* }}} */ + + +/* {{{ mysqlnd_read_buffer_bytes_left */ +static size_t +mysqlnd_read_buffer_bytes_left(const MYSQLND_READ_BUFFER * const buffer) +{ + return buffer->len; +} +/* }}} */ + + +/* {{{ mysqlnd_read_buffer_free */ +static void +mysqlnd_read_buffer_free(MYSQLND_READ_BUFFER ** buffer) +{ + DBG_ENTER("mysqlnd_read_buffer_free"); + if (*buffer) { + mnd_efree((*buffer)->data); + mnd_efree(*buffer); + *buffer = NULL; + } + DBG_VOID_RETURN; +} +/* }}} */ + + +/* {{{ mysqlnd_create_read_buffer */ +PHPAPI MYSQLND_READ_BUFFER * +mysqlnd_create_read_buffer(const size_t count) +{ + MYSQLND_READ_BUFFER * ret = mnd_emalloc(sizeof(MYSQLND_READ_BUFFER)); + DBG_ENTER("mysqlnd_create_read_buffer"); + ret->is_empty = mysqlnd_read_buffer_is_empty; + ret->read = mysqlnd_read_buffer_read; + ret->bytes_left = mysqlnd_read_buffer_bytes_left; + ret->free_buffer = mysqlnd_read_buffer_free; + ret->data = mnd_emalloc(count); + ret->size = ret->len = count; + ret->offset = 0; + DBG_RETURN(ret); +} +/* }}} */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ -- cgit v1.2.1 From 71c19800258ee3a9548af9a5e64ab0a62d1b1d8e Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Fri, 1 Jan 2016 20:06:12 +0200 Subject: Happy new year (Update copyright to 2016) --- ext/mysqlnd/mysqlnd_read_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysqlnd/mysqlnd_read_buffer.c') diff --git a/ext/mysqlnd/mysqlnd_read_buffer.c b/ext/mysqlnd/mysqlnd_read_buffer.c index 99cb321f3f..b055b2457f 100644 --- a/ext/mysqlnd/mysqlnd_read_buffer.c +++ b/ext/mysqlnd/mysqlnd_read_buffer.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 2006-2015 The PHP Group | + | Copyright (c) 2006-2016 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 | -- cgit v1.2.1 From 1c295d4a9ac78fcc2f77d6695987598bb7abcb83 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Wed, 16 Mar 2016 10:57:12 +0100 Subject: Fix more emails --- ext/mysqlnd/mysqlnd_read_buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_read_buffer.c') diff --git a/ext/mysqlnd/mysqlnd_read_buffer.c b/ext/mysqlnd/mysqlnd_read_buffer.c index b055b2457f..1d214c21db 100644 --- a/ext/mysqlnd/mysqlnd_read_buffer.c +++ b/ext/mysqlnd/mysqlnd_read_buffer.c @@ -12,10 +12,11 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | +----------------------------------------------------------------------+ */ + #include "php.h" #include "mysqlnd.h" #include "mysqlnd_debug.h" -- cgit v1.2.1