diff options
| author | Georg Richter <georg@php.net> | 2006-09-27 15:25:52 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2006-09-27 15:25:52 +0000 |
| commit | 0dc8637ed4a992284681fe018340c7cc978696f8 (patch) | |
| tree | 31c24653187ea3a5b8ebc45cb2a00974355983d8 /ext/mysqli/php_mysqli.h | |
| parent | a4b2e946f6dde35637380d6d6fed749cd21ca1e1 (diff) | |
| download | php-git-0dc8637ed4a992284681fe018340c7cc978696f8.tar.gz | |
ZTS fixes. Implemented Andrei's hints (simplifying unicode stuff)
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
| -rw-r--r-- | ext/mysqli/php_mysqli.h | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h index d682f0a4c7..00be2d11e3 100644 --- a/ext/mysqli/php_mysqli.h +++ b/ext/mysqli/php_mysqli.h @@ -229,13 +229,12 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML MYSQLI_RESOURCE *my_res; \ mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\ if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {\ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %R", UG(unicode)?IS_UNICODE:IS_STRING, intern->zo.ce->name);\ - printf("--------\n");\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %v", intern->zo.ce->name);\ RETURN_NULL();\ }\ __ptr = (__type)my_res->ptr; \ if (__check && my_res->status < __check) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid object or resource %R\n", UG(unicode)?IS_UNICODE:IS_STRING, intern->zo.ce->name); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid object or resource %v\n", intern->zo.ce->name); \ RETURN_NULL();\ }\ } @@ -273,43 +272,6 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML }\ } -#define MYSQLI_GET_STRING(a) &a.buf, &a.buflen, &a.buftype - -#define MYSQLI_FREE_STRING(a) \ -if (a.buftype == IS_UNICODE) {\ - efree(a.buf);\ -} - -#define MYSQLI_CONVERT_PARAM_STRING(a,c)\ -if (a.buftype == IS_UNICODE) {\ - a.status=U_ZERO_ERROR;\ - zend_unicode_to_string_ex(c, (char **)&a.buf, &a.buflen, a.buf, a.buflen, &a.status);\ -} - -#define MYSQLI_RETURN_CONV_STRING(conv, value) \ -if (UG(unicode)) { \ - UChar *ustr;\ - int ulen;\ - zend_string_to_unicode(conv, &ustr, &ulen, (value) ? value : "", (value) ? strlen(value) : 0);\ - RETURN_UNICODEL(ustr, ulen, 0);\ -} else {\ - RETURN_STRING((value) ? value : "", 1);\ -}\ - -#define MYSQLI_RETURN_CONV_STRINGL(conv, value, len, copy) \ -if (UG(unicode)) { \ - UChar *ustr;\ - int ulen;\ - zend_string_to_unicode(conv, &ustr, &ulen, (value) ? value : "", len);\ - RETURN_UNICODEL(ustr, ulen, 0);\ -} else {\ - RETURN_STRINGL((value) ? value : "", len, copy);\ -}\ - -#define MYSQLI_CONV_UTF8 unicode_globals.utf8_conv -#define MYSQLI_CONV_UCS2 unicode_globals.ucs2_conv -#define MYSQLI_CONV_ASCII unicode_globals.ascii_conv - #if WIN32|WINNT #define SCLOSE(a) closesocket(a) #else |