ws & cs fixes

diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index 8e134183d39569d1824837e93e40f1a6b9e502a4..18587f89376e528df6575e6ca68e320948efc732 100644 (file)
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -40,7 +40,7 @@ int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
                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 @@ int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
                } \
        }\
        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 @@ int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
                }\
        }\
        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 @@ int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
 /* }}} */
 
 /* {{{ 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 @@ int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
 /* }}} */
 
 /* {{{ 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 @@ int link_server_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
 /* }}} */
 
 /* {{{ 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 @@ MYSQLI_MAP_PROPERTY_LONG(link_warning_count_read, MYSQL, warning_count);
 /* 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 @@ int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
 /* }}} */
 
 /* {{{ 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 @@ mysqli_property_entry mysqli_link_property_entries[] = {
        {"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 @@ mysqli_property_entry mysqli_stmt_property_entries[] = {
        {"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
+ */

diff --git a/ext/mysqli/mysqli_repl.c b/ext/mysqli/mysqli_repl.c
index 871ff2bf9fdd4ae11c2aaa629810d92019fd7809..9ac0ad0c91d516cb1e179a08e28ed7d88683a31a 100644 (file)
--- a/ext/mysqli/mysqli_repl.c
+++ b/ext/mysqli/mysqli_repl.c
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@php.net>                                |
   +----------------------------------------------------------------------+
 
-  $Id:  
+  $Id$
 */
 
 #ifdef HAVE_CONFIG_H

diff --git a/ext/mysqli/mysqli_report.h b/ext/mysqli/mysqli_report.h
index 663d560e791d6cee9397c2047e2a8a05af5695a9..a8d63e5e87f39209c7b82be6f2ddc8dcc9fd6c15 100644 (file)
--- a/ext/mysqli/mysqli_report.h
+++ b/ext/mysqli/mysqli_report.h
@@ -14,6 +14,8 @@
   +----------------------------------------------------------------------+
   | Author: Georg Richter <georg@php.net>                                |
   +----------------------------------------------------------------------+
+
+  $Id$
 */
 
 #ifndef __HAVE_MYSQLI_PROFILER_H__

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index b0a33a24250fac631ed9e9c7397fa9d9bc2c37af..397703647ae55505bf5e63a766794283cbc9de02 100644 (file)
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -363,7 +363,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
        char                    *default_host;
        char                    *default_user;
        char                    *default_socket;
-    char            *default_pw;
+       char            *default_pw;
        int                             reconnect;
        long                    error_no;
        char                    *error_msg;