From 2e3fc57c5c205e352a805830fd3ec4c7dbfa2efa Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 10 Nov 2015 14:25:06 +0100 Subject: MNDR: - move things out of mysqlnd_priv.h --- ext/mysqlnd/mysqlnd_alloc.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_alloc.h') diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index 958aff8934..6cac245c7d 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -12,15 +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: Georg Richter | - | Andrey Hristov | + | Authors: Andrey Hristov | | Ulf Wendel | +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_debug.h 306938 2011-01-01 02:17:06Z felipe $ */ -/* $Id: mysqlnd_debug.h 306938 2011-01-01 02:17:06Z felipe $ */ - #ifndef MYSQLND_ALLOC_H #define MYSQLND_ALLOC_H -- cgit v1.2.1 From 49493a2dcfb2cd1758b69b13d9006ead3be0e066 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Fri, 1 Jan 2016 19:19:27 +0200 Subject: Happy new year (Update copyright to 2016) --- ext/mysqlnd/mysqlnd_alloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysqlnd/mysqlnd_alloc.h') diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index 53cf30f185..6bd5c10fae 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | 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 a19173e4af5ee82dce9c9d8211a064e7f77c68d9 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Mon, 4 Jan 2016 16:48:35 +0100 Subject: - Make functions static, as they are not needed to be public - exported through a structure - Fixed typo in statistic name - Added 2 static functions for copying a MYSQLND_CSTRING and converting a CSTRING to STRING. --- ext/mysqlnd/mysqlnd_alloc.h | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_alloc.h') diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index a41a0a75e6..0077a6cd57 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -39,6 +39,7 @@ struct st_mysqlnd_allocator_methods void * (*m_calloc)(unsigned int nmemb, size_t size MYSQLND_MEM_D); void * (*m_realloc)(void *ptr, size_t new_size MYSQLND_MEM_D); void (*m_free)(void *ptr MYSQLND_MEM_D); + char * (*m_pememdup)(const char * const ptr, size_t size, zend_bool persistent MYSQLND_MEM_D); char * (*m_pestrndup)(const char * const ptr, size_t size, zend_bool persistent MYSQLND_MEM_D); char * (*m_pestrdup)(const char * const ptr, zend_bool persistent MYSQLND_MEM_D); int (*m_sprintf)(char **pbuf, size_t max_len, const char *format, ...); @@ -48,24 +49,6 @@ struct st_mysqlnd_allocator_methods PHPAPI extern struct st_mysqlnd_allocator_methods mysqlnd_allocator; -PHPAPI void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D); -PHPAPI void _mysqlnd_efree(void *ptr MYSQLND_MEM_D); -PHPAPI void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); -PHPAPI void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D); -PHPAPI void _mysqlnd_free(void *ptr MYSQLND_MEM_D); -PHPAPI char * _mysqlnd_pestrndup(const char * const ptr, size_t size, zend_bool persistent MYSQLND_MEM_D); -PHPAPI char * _mysqlnd_pestrdup(const char * const ptr, zend_bool persistent MYSQLND_MEM_D); -PHPAPI int _mysqlnd_sprintf(char **pbuf, size_t max_len, const char *format, ...); -PHPAPI void _mysqlnd_sprintf_free(char * p); -PHPAPI int _mysqlnd_vsprintf(char **pbuf, size_t max_len, const char *format, va_list ap); - #define mnd_emalloc(size) mysqlnd_allocator.m_emalloc((size) MYSQLND_MEM_C) #define mnd_pemalloc(size, pers) mysqlnd_allocator.m_pemalloc((size), (pers) MYSQLND_MEM_C) #define mnd_ecalloc(nmemb, size) mysqlnd_allocator.m_ecalloc((nmemb), (size) MYSQLND_MEM_C) @@ -84,6 +67,22 @@ PHPAPI int _mysqlnd_vsprintf(char **pbuf, size_t max_len, const char *format, v #define mnd_vsprintf(p, mx_len, fmt,ap) mysqlnd_allocator.m_vsprintf((p), (mx_len), (fmt), (ap)) #define mnd_sprintf_free(p) mysqlnd_allocator.m_sprintf_free((p)) +static inline MYSQLND_STRING mnd_dup_cstring(const MYSQLND_CSTRING str, const zend_bool persistent) +{ + const MYSQLND_STRING ret = {(char*) mnd_pemalloc(str.l, persistent) + 1, str.l}; + if (ret.s) { + memcpy(ret.s, str.s, str.l); + ret.s[str.l] = '\0'; + } + return ret; +} + +static inline MYSQLND_CSTRING mnd_str2c(const MYSQLND_STRING str) +{ + const MYSQLND_CSTRING ret = {str.s, str.l}; + return ret; +} + #endif /* MYSQLND_ALLOC_H */ /* -- cgit v1.2.1 From e64b845c89d1d59b76e683a4a7cab6e1940a2b21 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 5 Jan 2016 13:19:32 +0100 Subject: Fix typo that was unhiding only with USE_ZEND_ALLOC --- ext/mysqlnd/mysqlnd_alloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysqlnd/mysqlnd_alloc.h') diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index 0077a6cd57..c8f99ec205 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -69,7 +69,7 @@ PHPAPI extern struct st_mysqlnd_allocator_methods mysqlnd_allocator; static inline MYSQLND_STRING mnd_dup_cstring(const MYSQLND_CSTRING str, const zend_bool persistent) { - const MYSQLND_STRING ret = {(char*) mnd_pemalloc(str.l, persistent) + 1, str.l}; + const MYSQLND_STRING ret = {(char*) mnd_pemalloc(str.l + 1, persistent), str.l}; if (ret.s) { memcpy(ret.s, str.s, str.l); ret.s[str.l] = '\0'; -- cgit v1.2.1 From 37418deb020772b8314527a7fcacd26f9c451a16 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 5 Jan 2016 16:28:33 +0100 Subject: Fix reloc for the allocator. Original files and lines were not showing correct. This seems to be a PHP7 issue. --- ext/mysqlnd/mysqlnd_alloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/mysqlnd/mysqlnd_alloc.h') diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index c8f99ec205..2ee33e00a3 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -22,7 +22,7 @@ PHPAPI extern const char * mysqlnd_debug_std_no_trace_funcs[]; -#define MYSQLND_MEM_D ZEND_FILE_LINE_ORIG_DC +#define MYSQLND_MEM_D ZEND_FILE_LINE_DC #define MYSQLND_MEM_C ZEND_FILE_LINE_CC struct st_mysqlnd_allocator_methods -- cgit v1.2.1 From 64cb71cc8b7aef9c9600c1e4add4cabbdc16408b Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Thu, 21 Jan 2016 12:59:23 +0100 Subject: Add missing macro --- ext/mysqlnd/mysqlnd_alloc.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/mysqlnd/mysqlnd_alloc.h') diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index 2ee33e00a3..85dfba5d09 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -61,6 +61,7 @@ PHPAPI extern struct st_mysqlnd_allocator_methods mysqlnd_allocator; #define mnd_calloc(nmemb, size) mysqlnd_allocator.m_calloc((nmemb), (size) MYSQLND_MEM_C) #define mnd_realloc(ptr, new_size) mysqlnd_allocator.m_realloc((ptr), (new_size) MYSQLND_MEM_C) #define mnd_free(ptr) mysqlnd_allocator.m_free((ptr) MYSQLND_MEM_C) +#define mnd_pememdup(ptr, size, pers) mysqlnd_allocator.m_pememdup((ptr), (size), (pers) MYSQLND_MEM_C) #define mnd_pestrndup(ptr, size, pers) mysqlnd_allocator.m_pestrndup((ptr), (size), (pers) MYSQLND_MEM_C) #define mnd_pestrdup(ptr, pers) mysqlnd_allocator.m_pestrdup((ptr), (pers) MYSQLND_MEM_C) #define mnd_sprintf(p, mx_len, fmt,...) mysqlnd_allocator.m_sprintf((p), (mx_len), (fmt), __VA_ARGS__) -- cgit v1.2.1 From f2ab731a8c47d2988ddf0d61cb06c0f62e17ab19 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Wed, 16 Mar 2016 10:24:52 +0100 Subject: Fix emails in headers. @mysql.com addresses are no more since many years. --- ext/mysqlnd/mysqlnd_alloc.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_alloc.h') diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index a70546b2d3..92d144954c 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -12,15 +12,12 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Georg Richter | - | Andrey Hristov | - | Ulf Wendel | + | Authors: Andrey Hristov | + | Ulf Wendel | + | Georg Richter | +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_debug.h 306938 2011-01-01 02:17:06Z felipe $ */ -/* $Id: mysqlnd_debug.h 306938 2011-01-01 02:17:06Z felipe $ */ - #ifndef MYSQLND_ALLOC_H #define MYSQLND_ALLOC_H -- cgit v1.2.1