archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

export more functionality for phpize builds

Browse source
This commit is contained in:
Andrey Hristov 2010-01-13 18:00:41 +00:00
parent 7ff1184be2
commit 204f52f7e0
11 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/mysqlnd/mysqlnd.h
View file

@ -60,8 +60,8 @@
/* Library related */ /* Library related */
void mysqlnd_library_init(TSRMLS_D); PHPAPI void mysqlnd_library_init(TSRMLS_D);
void mysqlnd_library_end(TSRMLS_D); PHPAPI void mysqlnd_library_end(TSRMLS_D);
PHPAPI unsigned int mysqlnd_plugin_register(); PHPAPI unsigned int mysqlnd_plugin_register();
PHPAPI unsigned int mysqlnd_plugin_count(); PHPAPI unsigned int mysqlnd_plugin_count();

4
ext/mysqlnd/mysqlnd_block_alloc.c
View file

@ -160,7 +160,7 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool
/* {{{ mysqlnd_mempool_create */ /* {{{ mysqlnd_mempool_create */
MYSQLND_MEMORY_POOL * PHPAPI MYSQLND_MEMORY_POOL *
mysqlnd_mempool_create(size_t arena_size TSRMLS_DC) mysqlnd_mempool_create(size_t arena_size TSRMLS_DC)
{ {
/* We calloc, because we free(). We don't mnd_calloc() for a reason. */ /* We calloc, because we free(). We don't mnd_calloc() for a reason. */
@ -179,7 +179,7 @@ mysqlnd_mempool_create(size_t arena_size TSRMLS_DC)
/* {{{ mysqlnd_mempool_destroy */ /* {{{ mysqlnd_mempool_destroy */
void PHPAPI void
mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC) mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
{ {
DBG_ENTER("mysqlnd_mempool_destroy"); DBG_ENTER("mysqlnd_mempool_destroy");

4
ext/mysqlnd/mysqlnd_block_alloc.h
View file

@ -23,8 +23,8 @@
#ifndef MYSQLND_BLOCK_ALLOC_H #ifndef MYSQLND_BLOCK_ALLOC_H
#define MYSQLND_BLOCK_ALLOC_H #define MYSQLND_BLOCK_ALLOC_H
MYSQLND_MEMORY_POOL * mysqlnd_mempool_create(size_t arena_size TSRMLS_DC); PHPAPI MYSQLND_MEMORY_POOL * mysqlnd_mempool_create(size_t arena_size TSRMLS_DC);
void mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC); PHPAPI void mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC);
#endif /* MYSQLND_BLOCK_ALLOC_H */ #endif /* MYSQLND_BLOCK_ALLOC_H */

28
ext/mysqlnd/mysqlnd_debug.h
View file

@ -58,27 +58,27 @@ struct st_mysqlnd_debug
const char ** skip_functions; const char ** skip_functions;
}; };
extern const char * mysqlnd_debug_std_no_trace_funcs[]; PHPAPI extern const char * mysqlnd_debug_std_no_trace_funcs[];
PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC); PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC);
#define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC #define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC
void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D);
void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D); PHPAPI void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D);
void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D);
void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D); PHPAPI void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D);
void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D);
void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D); PHPAPI void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D);
void _mysqlnd_efree(void *ptr MYSQLND_MEM_D); PHPAPI void _mysqlnd_efree(void *ptr MYSQLND_MEM_D);
void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D); PHPAPI void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D);
void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D);
void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D);
void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D); PHPAPI void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D);
void _mysqlnd_free(void *ptr MYSQLND_MEM_D); PHPAPI void _mysqlnd_free(void *ptr MYSQLND_MEM_D);
char * mysqlnd_get_backtrace(TSRMLS_D); PHPAPI char * mysqlnd_get_backtrace(TSRMLS_D);
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0) #define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0) #define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace == FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0)

6
ext/mysqlnd/mysqlnd_priv.h
View file

@ -154,9 +154,9 @@ struct st_mysqlnd_perm_bind {
extern struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST + 1]; extern struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST + 1];
extern const char * const mysqlnd_old_passwd; PHPAPI extern const char * const mysqlnd_old_passwd;
extern const char * const mysqlnd_out_of_sync; PHPAPI extern const char * const mysqlnd_out_of_sync;
extern const char * const mysqlnd_server_gone; PHPAPI extern const char * const mysqlnd_server_gone;
enum_func_status mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_warning TSRMLS_DC); enum_func_status mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_warning TSRMLS_DC);

3
ext/mysqlnd/mysqlnd_result.c
View file

@ -1531,7 +1531,8 @@ MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES *result, unsigned int
/* {{{ mysqlnd_result_init */ /* {{{ mysqlnd_result_init */
MYSQLND_RES *mysqlnd_result_init(unsigned int field_count TSRMLS_DC) PHPAPI MYSQLND_RES *
mysqlnd_result_init(unsigned int field_count TSRMLS_DC)
{ {
size_t alloc_size = sizeof(MYSQLND_RES) + mysqlnd_plugin_count() * sizeof(void *); size_t alloc_size = sizeof(MYSQLND_RES) + mysqlnd_plugin_count() * sizeof(void *);
MYSQLND_RES *ret = mnd_ecalloc(1, alloc_size); MYSQLND_RES *ret = mnd_ecalloc(1, alloc_size);

2
ext/mysqlnd/mysqlnd_result.h
View file

@ -23,7 +23,7 @@
#ifndef MYSQLND_RESULT_H #ifndef MYSQLND_RESULT_H
#define MYSQLND_RESULT_H #define MYSQLND_RESULT_H
MYSQLND_RES *mysqlnd_result_init(unsigned int field_count TSRMLS_DC); PHPAPI MYSQLND_RES * mysqlnd_result_init(unsigned int field_count TSRMLS_DC);
enum_func_status mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT *stmt TSRMLS_DC); enum_func_status mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT *stmt TSRMLS_DC);

2
ext/mysqlnd/mysqlnd_result_meta.c
View file

@ -437,7 +437,7 @@ MYSQLND_CLASS_METHODS_END;
/* {{{ mysqlnd_result_meta_init */ /* {{{ mysqlnd_result_meta_init */
MYSQLND_RES_METADATA * PHPAPI MYSQLND_RES_METADATA *
mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC) mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC)
{ {
MYSQLND_RES_METADATA *ret; MYSQLND_RES_METADATA *ret;

2
ext/mysqlnd/mysqlnd_result_meta.h
View file

@ -24,7 +24,7 @@
#define MYSQLND_RESULT_META_H #define MYSQLND_RESULT_META_H
MYSQLND_RES_METADATA *mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC); PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC);

2
ext/mysqlnd/mysqlnd_statistics.h
View file

@ -24,7 +24,7 @@
#define MYSQLND_STATISTICS_H #define MYSQLND_STATISTICS_H
extern MYSQLND_STATS *mysqlnd_global_stats; PHPAPI extern MYSQLND_STATS * mysqlnd_global_stats;
typedef struct st_mysqlnd_string typedef struct st_mysqlnd_string
{ {

10
ext/mysqlnd/mysqlnd_wireprotocol.h
View file

@ -31,8 +31,8 @@
#define MYSQLND_NULL_LENGTH (unsigned long) ~0 #define MYSQLND_NULL_LENGTH (unsigned long) ~0
/* Used in mysqlnd_debug.c */ /* Used in mysqlnd_debug.c */
extern const char mysqlnd_read_header_name[]; PHPAPI extern const char mysqlnd_read_header_name[];
extern const char mysqlnd_read_body_name[]; PHPAPI extern const char mysqlnd_read_body_name[];
/* Packet handling */ /* Packet handling */
@ -44,7 +44,7 @@ extern const char mysqlnd_read_body_name[];
((packet)->header.m->free_mem((packet), FALSE TSRMLS_CC)); \ ((packet)->header.m->free_mem((packet), FALSE TSRMLS_CC)); \
} while (0); } while (0);
extern const char * const mysqlnd_command_to_text[COM_END]; PHPAPI extern const char * const mysqlnd_command_to_text[COM_END];
/* Low-level extraction functionality */ /* Low-level extraction functionality */
typedef struct st_mysqlnd_packet_methods { typedef struct st_mysqlnd_packet_methods {
@ -244,12 +244,12 @@ typedef struct st_mysqlnd_packet_chg_user_resp {
} MYSQLND_PACKET_CHG_USER_RESPONSE; } MYSQLND_PACKET_CHG_USER_RESPONSE;
void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const pass); PHPAPI void php_mysqlnd_scramble(zend_uchar * const buffer, const zend_uchar * const scramble, const zend_uchar * const pass);
unsigned long php_mysqlnd_net_field_length(zend_uchar **packet); unsigned long php_mysqlnd_net_field_length(zend_uchar **packet);
zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, uint64_t length); zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, uint64_t length);
extern char * const mysqlnd_empty_string; PHPAPI extern char * const mysqlnd_empty_string;
void php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields, void php_mysqlnd_rowp_read_binary_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer, zval ** fields,