Author: grichter
Date: 2007-03-27 17:19:40 +0200 (Tue, 27 Mar 2007)
New Revision: 266
Modified:
trunk/ext/mysqli/mysqli_mysqlnd.h
trunk/ext/mysqli/mysqlnd/mysqlnd.c
trunk/ext/mysqli/mysqlnd/mysqlnd.h
trunk/ext/mysqli/mysqlnd/mysqlnd_charset.c
trunk/ext/mysqli/mysqlnd/mysqlnd_loaddata.c
trunk/ext/mysqli/mysqlnd/mysqlnd_palloc.c
trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.c
Log:
windows fixes
Modified: trunk/ext/mysqli/mysqli_mysqlnd.h
===================================================================
--- trunk/ext/mysqli/mysqli_mysqlnd.h 2007-03-27 10:55:12 UTC (rev 265)
+++ trunk/ext/mysqli/mysqli_mysqlnd.h 2007-03-27 15:19:40 UTC (rev 266)
@@ -99,8 +99,8 @@
#define mysql_store_result(r) mysqlnd_store_result((r))
#define mysql_use_result(r) mysqlnd_use_result((r))
#define mysql_thread_id(r) mysqlnd_thread_id((r))
-#define mysql_get_client_info() mysqlnd_get_client_info()
-#define mysql_get_client_version() mysqlnd_get_client_version()
+#define mysql_get_client_info() MYSQLND_VERSION
+#define mysql_get_client_version() MYSQLND_VERSION_ID
#define mysql_get_host_info(r) mysqlnd_get_host_info((r))
#define mysql_get_proto_info(r) mysqlnd_get_proto_info((r))
#define mysql_get_server_info(r) mysqlnd_get_server_info((r))
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd.c 2007-03-27 10:55:12 UTC (rev 265)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd.c 2007-03-27 15:19:40 UTC (rev 266)
@@ -64,7 +64,7 @@
/* {{{ mysqlnd_library_init */
-void mysqlnd_library_init()
+PHPAPI void mysqlnd_library_init()
{
if (mysqlnd_library_initted == FALSE) {
mysqlnd_library_initted = TRUE;
@@ -79,7 +79,7 @@
/* {{{ mysqlnd_library_end */
-void mysqlnd_library_end()
+PHPAPI void mysqlnd_library_end()
{
if (mysqlnd_library_initted == TRUE) {
#ifdef ZTS
@@ -567,7 +567,7 @@
/* {{{ mysqlnd_start_psession */
-void mysqlnd_restart_psession(MYSQLND *conn)
+PHPAPI void mysqlnd_restart_psession(MYSQLND *conn)
{
MYSQLND_INC_CONN_STATISTIC(&conn->stats, STAT_CONNECT_REUSED);
}
@@ -575,7 +575,7 @@
/* {{{ mysqlnd_end_psession */
-void mysqlnd_end_psession(MYSQLND *conn)
+PHPAPI void mysqlnd_end_psession(MYSQLND *conn)
{
}
@@ -583,7 +583,7 @@
/* {{{ mysqlnd_connect */
-MYSQLND *mysqlnd_connect(MYSQLND *conn,
+PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn,
char *host, char *user,
char *passwd, unsigned int passwd_len,
char *db, unsigned int db_len,
@@ -1226,7 +1226,7 @@
/* {{{ _mysqlnd_fetch_lengths */
-unsigned long * _mysqlnd_fetch_lengths(MYSQLND_RES * const result)
+PHPAPI unsigned long * _mysqlnd_fetch_lengths(MYSQLND_RES * const result)
{
return result->m.fetch_lengths? result->m.fetch_lengths(result):NULL;
}
@@ -1695,7 +1695,7 @@
/* {{{ _mysqlnd_real_escape_quotes */
static
-ulong _mysqlnd_real_escape_quotes(const MYSQLND * const conn, char *newstr, char
*escapestr, int escapestr_len)
+ulong _mysqlnd_real_escape_quotes(const MYSQLND * const conn, char *newstr, const char
*escapestr, int escapestr_len)
{
const char *newstr_s = newstr;
const char *newstr_e = newstr + 2 * escapestr_len;
@@ -1703,10 +1703,10 @@
zend_bool escape_overflow = FALSE;
for (;escapestr < end; escapestr++) {
+ uint len;
/* check unicode characters */
if (conn->charset->char_maxlen > 1 &&
conn->charset->mb_charlen(*escapestr) > 1) {
- uint len = conn->charset->mb_valid(escapestr, end);
-
+ len = conn->charset->mb_valid(escapestr, end);
/* check possible overflow */
if ((newstr + len) > newstr_e) {
escape_overflow = TRUE;
@@ -1746,7 +1746,7 @@
/* {{{ _mysqlnd_real_escape_slashes */
static
-ulong _mysqlnd_real_escape_slashes(const MYSQLND * const conn, char *newstr, char
*escapestr, int escapestr_len)
+ulong _mysqlnd_real_escape_slashes(const MYSQLND * const conn, char *newstr, const char
*escapestr, int escapestr_len)
{
const char *newstr_s = newstr;
const char *newstr_e = newstr + 2 * escapestr_len;
@@ -1754,12 +1754,14 @@
zend_bool escape_overflow = FALSE;
for (;escapestr < end; escapestr++) {
+ uint len;
char esc = '\0';
/* check unicode characters */
if (conn->charset->char_maxlen > 1 &&
conn->charset->mb_charlen(*escapestr) > 1) {
- uint len = conn->charset->mb_valid(escapestr, end);
-
+ len = conn->charset->mb_valid(escapestr, end);
+ if (len < 1)
+ printf("len: %d escape: %ld end: %ld esclen: %d\n", len, escapestr, end,
escapestr_len);
/* check possible overflow */
if ((newstr + len) > newstr_e) {
escape_overflow = TRUE;
@@ -1813,7 +1815,7 @@
}
}
*newstr = '\0';
-
+ printf("\n");
if (escape_overflow) {
return (ulong)~0;
}
@@ -1824,7 +1826,7 @@
/* {{{ _mysqlnd_real_escape_string */
static
-ulong _mysqlnd_real_escape_string(const MYSQLND * const conn, char *newstr, char
*escapestr, int escapestr_len)
+ulong _mysqlnd_real_escape_string(const MYSQLND * const conn, char *newstr, const char
*escapestr, int escapestr_len)
{
if (conn->upsert_status.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES) {
return _mysqlnd_real_escape_quotes(conn, newstr, escapestr, escapestr_len);
@@ -2599,7 +2601,7 @@
/* {{{ mysqlnd_init */
-MYSQLND *mysqlnd_init(zend_bool persistent)
+PHPAPI MYSQLND *mysqlnd_init(zend_bool persistent)
{
MYSQLND *ret = pecalloc(1, sizeof(MYSQLND), persistent);
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd.h
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd.h 2007-03-27 10:55:12 UTC (rev 265)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd.h 2007-03-27 15:19:40 UTC (rev 266)
@@ -573,7 +573,7 @@
MYSQLND_FIELD * (*fetch_field)(MYSQLND_RES * const result);
MYSQLND_FIELD * (*fetch_field_direct)(const MYSQLND_RES * const result,
MYSQLND_FIELD_OFFSET fieldnr);
- unsigned long * (*fetch_lengths)(MYSQLND_RES * const result);
+ unsigned long * (*fetch_lengths)(MYSQLND_RES * const result);
void (*free_result_buffers)(MYSQLND_RES * result TSRMLS_DC); /* private */
enum_func_status (*free_result)(MYSQLND_RES * result, zend_bool implicit TSRMLS_DC);
};
@@ -801,10 +801,10 @@
/* Library related */
-void mysqlnd_library_init();
-void mysqlnd_library_end();
-void mysqlnd_restart_psession(MYSQLND *conn);
-void mysqlnd_end_psession(MYSQLND *conn);
+PHPAPI void mysqlnd_library_init();
+PHPAPI void mysqlnd_library_end();
+PHPAPI void mysqlnd_restart_psession(MYSQLND *conn);
+PHPAPI void mysqlnd_end_psession(MYSQLND *conn);
#define mysqlnd_thread_safe() TRUE
const MYSQLND_CHARSET * mysqlnd_find_charset_nr(uint charsetno);
@@ -812,8 +812,8 @@
/* Connect */
-MYSQLND * mysqlnd_init(zend_bool persistent);
-MYSQLND * mysqlnd_connect(MYSQLND *conn,
+PHPAPI MYSQLND * mysqlnd_init(zend_bool persistent);
+PHPAPI MYSQLND * mysqlnd_connect(MYSQLND *conn,
char *host, char *user,
char *passwd, unsigned int passwd_len,
char *db, unsigned int db_len,
@@ -909,7 +909,7 @@
#define mysqlnd_num_rows(result) (result)->m.num_rows((result))
#define mysqlnd_num_fields(result) (result)->m.num_fields((result))
-unsigned long * _mysqlnd_fetch_lengths(MYSQLND_RES * const result);
+PHPAPI unsigned long * _mysqlnd_fetch_lengths(MYSQLND_RES * const result);
#define mysqlnd_fetch_lengths(result) _mysqlnd_fetch_lengths((result))
#define mysqlnd_field_seek(result, ofs) (result)->m.seek_field((result), (ofs))
@@ -942,8 +942,8 @@
const char * mysqlnd_field_type_name(enum mysqlnd_field_types field_type);
/* LOAD DATA LOCAL */
-void mysqlnd_local_infile_default(MYSQLND *conn);
-void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char * const
funcname);
+PHPAPI void mysqlnd_local_infile_default(MYSQLND *conn);
+PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char * const
funcname);
/* Simple commands */
#define mysqlnd_autocommit(conn, mode) (conn)->m->query((conn),(mode) ? "SET
AUTOCOMMIT=1":"SET AUTOCOMMIT=0", 16 TSRMLS_CC)
@@ -987,20 +987,20 @@
#define mysqlnd_stmt_attr_set(stmt, attr, value) (stmt)->m->set_attribute((stmt),
(attr), (value))
-enum_func_status mysqlnd_stmt_fetch(MYSQLND_STMT * const stmt, zend_bool * const
fetched_anything TSRMLS_DC);
+PHPAPI enum_func_status mysqlnd_stmt_fetch(MYSQLND_STMT * const stmt, zend_bool * const
fetched_anything TSRMLS_DC);
/* Performance statistics */
-void _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
+PHPAPI void _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
/* Persistent caching zval allocator */
-MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_init_cache(unsigned int cache_size);
+PHPAPI MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_init_cache(unsigned int cache_size);
MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_get_cache_reference(MYSQLND_ZVAL_PCACHE * const
cache);
-void mysqlnd_palloc_free_cache_reference(MYSQLND_ZVAL_PCACHE **cache);
-void mysqlnd_palloc_rinit(MYSQLND_ZVAL_PCACHE * const cache);
-void mysqlnd_palloc_rshutdown(MYSQLND_ZVAL_PCACHE * const cache);
-void mysqlnd_palloc_stats(const MYSQLND_ZVAL_PCACHE * const cache, zval
*return_value);
+PHPAPI void mysqlnd_palloc_free_cache_reference(MYSQLND_ZVAL_PCACHE **cache);
+PHPAPI void mysqlnd_palloc_rinit(MYSQLND_ZVAL_PCACHE * const cache);
+PHPAPI void mysqlnd_palloc_rshutdown(MYSQLND_ZVAL_PCACHE * const cache);
+PHPAPI void mysqlnd_palloc_stats(const MYSQLND_ZVAL_PCACHE * const cache, zval
*return_value);
/* There two should not be used from outside */
void * mysqlnd_palloc_get_zval(MYSQLND_ZVAL_PCACHE * const cache, zend_bool
*allocated);
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_charset.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_charset.c 2007-03-27 10:55:12 UTC (rev 265)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_charset.c 2007-03-27 15:19:40 UTC (rev 266)
@@ -84,9 +84,9 @@
/* {{{ big5 functions */
-#define valid_big5head(c) (0xA1 <= (zend_uchar)(c) && (zend_uchar)(c) <=
0xF9)
-#define valid_big5tail(c) ((0x40 <= (zend_uchar)(c) && (zend_uchar)(c) <=
0x7E) || \
- (0xA1 <= (zend_uchar)(c) && (zend_uchar)(c) <= 0xFE))
+#define valid_big5head(c) (0xA1 <= (uint)(c) && (uint)(c) <= 0xF9)
+#define valid_big5tail(c) ((0x40 <= (uint)(c) && (uint)(c) <= 0x7E) || \
+ (0xA1 <= (uint)(c) && (uint)(c) <= 0xFE))
#define isbig5code(c,d) (isbig5head(c) && isbig5tail(d))
@@ -110,8 +110,8 @@
static uint check_mb_cp932(const char *start, const char *end)
{
- return (((end > start) + 1) && valid_cp932head((zend_uchar)start[0])
&&
- valid_cp932tail((zend_uchar)start[1])) ? 2 : 0;
+ return (((end > start) + 1) && valid_cp932head((uint)start[0]) &&
+ valid_cp932tail((uint)start[1])) ? 2 : 0;
}
@@ -123,7 +123,7 @@
/* {{{ euckr functions */
-#define valid_euckr(c) ((zend_uchar)c >= 0xA1 && (zend_uchar)c <= 0xFE)
+#define valid_euckr(c) ((uint)c >= 0xA1 && (uint)c <= 0xFE)
static uint check_mb_euckr(const char *start, const char *end)
{
@@ -155,7 +155,7 @@
static uint check_mb_eucjpms(const char *start, const char *end)
{
- if (*((zend_uchar *)start) < 0x80) {
+ if (*((uint *)start) < 0x80) {
return 0; /* invalid eucjpms character */
}
if (valid_eucjpms(start[0]) && (end - start) > 1 &&
valid_eucjpms(start[1])) {
@@ -192,8 +192,8 @@
static uint check_mb_gb2312(const char *start, const char *end)
{
- return (end - start > 1 || valid_gb2312_head((zend_uchar)start[0]) ||
- valid_gb2312_tail((zend_uchar)start[1])) ? 2 : 0;
+ return (end - start > 1 || valid_gb2312_head((uint)start[0]) ||
+ valid_gb2312_tail((uint)start[1])) ? 2 : 0;
}
@@ -205,8 +205,8 @@
/* {{{ gbk functions */
-#define valid_gbk_head(c) ((zend_uchar)(c >> 8))
-#define valid_gbk_tail(c) ((zend_uchar)(c & 0xFF))
+#define valid_gbk_head(c) ((uint)(c) >> 8)
+#define valid_gbk_tail(c) ((uint)(c) & 0xFF)
static uint check_mb_gbk(const char *start, const char *end)
{
@@ -218,7 +218,7 @@
static uint mysqlnd_mbcharlen_gbk(uint gbk)
{
- return (valid_gbk_head(gbk)) ? 2 : 1;
+ return (valid_gbk_head(gbk) ? 2 : 1);
}
/* }}} */
@@ -234,13 +234,13 @@
if (end - start <= 1) {
return 0;
}
- return (valid_sjis_head((zend_uchar)start[0]) &&
valid_sjis_tail((zend_uchar)start[1])) ? 2 : 0;
+ return (valid_sjis_head((uint)start[0]) && valid_sjis_tail((uint)start[1])) ? 2
: 0;
}
static uint mysqlnd_mbcharlen_sjis(uint sjis)
{
- return (valid_sjis_head((zend_uchar)sjis)) ? 2 : 1;
+ return (valid_sjis_head((uint)sjis)) ? 2 : 1;
}
/* }}} */
@@ -266,7 +266,7 @@
static uint check_mb_ujis(const char *start, const char *end)
{
- if ((zend_uchar)start[0] < 0x80) {
+ if ((uint)start[0] < 0x80) {
return 0; /* invalid ujis character */
}
if (valid_ujis(*(start)) && valid_ujis(*((start)+1))) {
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_loaddata.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_loaddata.c 2007-03-27 10:55:12 UTC (rev 265)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_loaddata.c 2007-03-27 15:19:40 UTC (rev 266)
@@ -193,7 +193,7 @@
/* {{{ mysqlnd_local_infile_default */
-void mysqlnd_local_infile_default(MYSQLND *conn)
+PHPAPI void mysqlnd_local_infile_default(MYSQLND *conn)
{
conn->infile.local_infile_init = mysqlnd_local_infile_init;
conn->infile.local_infile_read = mysqlnd_local_infile_read;
@@ -209,7 +209,7 @@
/* }}} */
/* {{{ mysqlnd_set_local_infile_handler */
-void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char * const funcname)
+PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char * const
funcname)
{
ALLOC_ZVAL(conn->infile.callback);
ZVAL_STRING(conn->infile.callback, funcname, 1);
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_palloc.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_palloc.c 2007-03-27 10:55:12 UTC (rev 265)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_palloc.c 2007-03-27 15:19:40 UTC (rev 266)
@@ -44,7 +44,7 @@
/* {{{ mysqlnd_palloc_init_cache */
-MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_init_cache(unsigned int cache_size)
+PHPAPI MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_init_cache(unsigned int cache_size)
{
MYSQLND_ZVAL_PCACHE *ret = calloc(1, sizeof(MYSQLND_ZVAL_PCACHE));
unsigned int i;
@@ -128,7 +128,7 @@
/* {{{ mysqlnd_palloc_free_cache_reference */
-void mysqlnd_palloc_free_cache_reference(MYSQLND_ZVAL_PCACHE **cache)
+PHPAPI void mysqlnd_palloc_free_cache_reference(MYSQLND_ZVAL_PCACHE **cache)
{
#ifndef MYSQLND_SILENT
php_printf("[mysqlnd_palloc_free_cache_reference %p] refs=%d\n", *cache,
(*cache)->references);
@@ -392,7 +392,7 @@
/* {{{ mysqlnd_palloc_rinit */
-void mysqlnd_palloc_rinit(MYSQLND_ZVAL_PCACHE * const cache)
+PHPAPI void mysqlnd_palloc_rinit(MYSQLND_ZVAL_PCACHE * const cache)
{
return;
}
@@ -400,7 +400,7 @@
/* {{{ mysqlnd_palloc_rshutdown */
-void mysqlnd_palloc_rshutdown(MYSQLND_ZVAL_PCACHE * const cache)
+PHPAPI void mysqlnd_palloc_rshutdown(MYSQLND_ZVAL_PCACHE * const cache)
{
unsigned int i;
#ifndef MYSQLND_SILENT
@@ -423,7 +423,7 @@
/* {{{ mysqlnd_palloc_rshutdown */
-void mysqlnd_palloc_stats(const MYSQLND_ZVAL_PCACHE * const cache, zval *return_value)
+PHPAPI void mysqlnd_palloc_stats(const MYSQLND_ZVAL_PCACHE * const cache, zval
*return_value)
{
if (cache) {
#if PHP_MAJOR_VERSION >= 6
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c 2007-03-27 10:55:12 UTC (rev 265)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c 2007-03-27 15:19:40 UTC (rev 266)
@@ -790,7 +790,7 @@
/* {{{ mysqlnd_stmt_fetch */
-enum_func_status
+PHPAPI enum_func_status
mysqlnd_stmt_fetch(MYSQLND_STMT * const stmt, zend_bool * const fetched_anything
TSRMLS_DC)
{
if (!stmt->result ||
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.c 2007-03-27 10:55:12 UTC (rev 265)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_statistics.c 2007-03-27 15:19:40 UTC (rev 266)
@@ -108,7 +108,7 @@
/* {{{ _mysqlnd_get_client_stats */
-void _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC)
+PHPAPI void _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC)
{
MYSQLND_STATS stats, *stats_ptr = mysqlnd_global_stats;
| Thread |
|---|
| • PHP mysqlnd svn commit: r266 - in trunk/ext/mysqli: . mysqlnd | grichter | 27 Mar |
