sniper Thu Feb 26 07:33:24 2004 EDT Modified files: /php-src/ext/mysqli mysqli_prop.c mysqli_repl.c mysqli_report.h php_mysqli.h Log: ws & cs fixes http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.10&r2=1.11&ty=u Index: php-src/ext/mysqli/mysqli_prop.c diff -u php-src/ext/mysqli/mysqli_prop.c:1.10 php-src/ext/mysqli/mysqli_prop.c:1.11 --- php-src/ext/mysqli/mysqli_prop.c:1.10 Thu Feb 26 03:27:24 2004 +++ php-src/ext/mysqli/mysqli_prop.c Thu Feb 26 07:33:23 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli_prop.c,v 1.10 2004/02/26 08:27:24 georg Exp $ + $Id: mysqli_prop.c,v 1.11 2004/02/26 12:33:23 sniper Exp $ */ #ifdef HAVE_CONFIG_H @@ -40,7 +40,7 @@ ZVAL_LONG(*retval, (long)p->__val);\ }\ return SUCCESS;\ -}\ +} #define MYSQLI_MAP_PROPERTY_LONG_LONG( __func, __type, __val)\ int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \ @@ -59,12 +59,12 @@ } \ }\ return SUCCESS;\ -}\ +} #define MYSQLI_MAP_PROPERTY_STRING( __func, __type, __val)\ -int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \ +int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\ {\ - __type *p = (__type *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; \ + __type *p = (__type *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;\ ALLOC_ZVAL(*retval);\ if (!p) {\ ZVAL_NULL(*retval);\ @@ -76,10 +76,11 @@ }\ }\ return SUCCESS;\ -}\ +} /* {{{ property link_client_version_read */ -int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) { +int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) +{ ALLOC_ZVAL(*retval); ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1); return SUCCESS; @@ -87,7 +88,8 @@ /* }}} */ /* {{{ property link_connect_errno_read */ -int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC) { +int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC) +{ ALLOC_ZVAL(*retval); ZVAL_LONG(*retval, (long)MyG(error_no)); return SUCCESS; @@ -95,8 +97,9 @@ /* }}} */ /* {{{ property link_server_version_read */ -int link_server_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) { - MYSQL *mysql = (MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; +int link_server_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) +{ + MYSQL *mysql = (MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; ALLOC_ZVAL(*retval); ZVAL_LONG(*retval, mysql_get_server_version(mysql)); return SUCCESS; @@ -104,7 +107,8 @@ /* }}} */ /* {{{ property link_connect_error_read */ -int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC) { +int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC) +{ ALLOC_ZVAL(*retval); ZVAL_STRING(*retval, MyG(error_msg), 1); return SUCCESS; @@ -135,7 +139,8 @@ /* result properties */ /* {{{ property result_type_read */ -int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC) { +int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC) +{ MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; ALLOC_ZVAL(*retval); @@ -149,7 +154,8 @@ /* }}} */ /* {{{ property result_lengths_read */ -int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC) { +int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC) +{ MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; ALLOC_ZVAL(*retval); @@ -207,7 +213,7 @@ {"server_capabilities", link_server_capabilities_read, NULL}, {"server_status", link_server_status_read, NULL}, {"server_info", link_server_info_read, NULL}, - {"server_version", link_server_version_read, NULL}, + {"server_version", link_server_version_read, NULL}, {"sqlstate", link_sqlstate_read, NULL}, {"port", link_port_read, NULL}, {"protocol_version", link_protocol_version_read, NULL}, @@ -239,3 +245,12 @@ {"sqlstate", stmt_sqlstate_read, NULL}, {NULL, NULL, NULL} }; + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_repl.c?r1=1.1&r2=1.2&ty=u Index: php-src/ext/mysqli/mysqli_repl.c diff -u php-src/ext/mysqli/mysqli_repl.c:1.1 php-src/ext/mysqli/mysqli_repl.c:1.2 --- php-src/ext/mysqli/mysqli_repl.c:1.1 Fri Feb 20 08:09:14 2004 +++ php-src/ext/mysqli/mysqli_repl.c Thu Feb 26 07:33:23 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: + $Id: mysqli_repl.c,v 1.2 2004/02/26 12:33:23 sniper Exp $ */ #ifdef HAVE_CONFIG_H http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_report.h?r1=1.2&r2=1.3&ty=u Index: php-src/ext/mysqli/mysqli_report.h diff -u php-src/ext/mysqli/mysqli_report.h:1.2 php-src/ext/mysqli/mysqli_report.h:1.3 --- php-src/ext/mysqli/mysqli_report.h:1.2 Thu Jan 8 12:32:31 2004 +++ php-src/ext/mysqli/mysqli_report.h Thu Feb 26 07:33:23 2004 @@ -14,6 +14,8 @@ +----------------------------------------------------------------------+ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ + + $Id: mysqli_report.h,v 1.3 2004/02/26 12:33:23 sniper Exp $ */ #ifndef __HAVE_MYSQLI_PROFILER_H__ http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.31&r2=1.32&ty=u Index: php-src/ext/mysqli/php_mysqli.h diff -u php-src/ext/mysqli/php_mysqli.h:1.31 php-src/ext/mysqli/php_mysqli.h:1.32 --- php-src/ext/mysqli/php_mysqli.h:1.31 Thu Feb 26 06:40:35 2004 +++ php-src/ext/mysqli/php_mysqli.h Thu Feb 26 07:33:23 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: php_mysqli.h,v 1.31 2004/02/26 11:40:35 georg Exp $ + $Id: php_mysqli.h,v 1.32 2004/02/26 12:33:23 sniper Exp $ */ /* A little hack to prevent build break, when mysql is used together with @@ -363,7 +363,7 @@ char *default_host; char *default_user; char *default_socket; - char *default_pw; + char *default_pw; int reconnect; long error_no; char *error_msg;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php