From f8dcfbc74f8e04ea95925cbf8f8d5ccd8c127fda Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Thu, 17 Dec 2009 13:29:46 +0000 Subject: refactoring : move more network related functions to mysqlnd_net.c . Now communication is split on two levels: - logical (functions send and receive) - physical (functions network_read and network_write) --- ext/mysqlnd/mysqlnd_structs.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_structs.h') diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index a791e7dc95..68776d12b6 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -231,9 +231,11 @@ typedef struct st_mysqlnd_read_buffer { struct st_mysqlnd_net_methods { enum_func_status (*connect)(MYSQLND_NET * net, const char * const scheme, size_t scheme_len, zend_bool persistent, char **errstr, int * errcode TSRMLS_DC); - enum_func_status (*stream_read)(MYSQLND * conn, zend_uchar * buffer, size_t count TSRMLS_DC); - size_t (*stream_write)(MYSQLND * const conn, const zend_uchar * const buf, size_t count TSRMLS_DC); + size_t (*send)(MYSQLND * const conn, char * const buf, size_t count TSRMLS_DC); + size_t (*receive)(MYSQLND * conn, zend_uchar * buffer, size_t count TSRMLS_DC); enum_func_status (*set_client_option)(MYSQLND_NET * const net, enum_mysqlnd_option option, const char * const value TSRMLS_DC); + enum_func_status (*network_read)(MYSQLND * conn, zend_uchar * buffer, size_t count TSRMLS_DC); + size_t (*network_write)(MYSQLND * const conn, const zend_uchar * const buf, size_t count TSRMLS_DC); void (*free_contents)(MYSQLND_NET * net TSRMLS_DC); }; -- cgit v1.2.1