fix warnings due to change in zend_property_info (structure extended in the middle!!)

diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
index fd4698febce8ce0fe0634afceb3afa84a2b7f76a..e6a1fc8fb4335c9a7665ffca5cfd67e6bdd5060b 100644 (file)
--- a/ext/mysqli/mysqli_driver.c
+++ b/ext/mysqli/mysqli_driver.c
@@ -151,14 +151,14 @@ const mysqli_property_entry mysqli_driver_property_entries[] = {
 };
 
 /* {{{ mysqli_warning_property_info_entries */
-zend_property_info mysqli_driver_property_info_entries[] = {
-       {ZEND_ACC_PUBLIC, "client_info",        sizeof("client_info") - 1,              0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "client_version",     sizeof("client_version") - 1,   0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "driver_version",     sizeof("driver_version") - 1,   0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "embedded",           sizeof("embedded") - 1,                 0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "reconnect",          sizeof("reconnect") - 1,                0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "report_mode",        sizeof("report_mode") - 1,              0, NULL, 0, NULL},
-       {0,                                     NULL,                   0,                                                              0, NULL, 0, NULL},
+const zend_property_info mysqli_driver_property_info_entries[] = {
+       {ZEND_ACC_PUBLIC, "client_info",        sizeof("client_info") - 1,              -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "client_version",     sizeof("client_version") - 1,   -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "driver_version",     sizeof("driver_version") - 1,   -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "embedded",           sizeof("embedded") - 1,                 -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "reconnect",          sizeof("reconnect") - 1,                -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "report_mode",        sizeof("report_mode") - 1,              -1, 0, NULL, 0, NULL},
+       {0,                                     NULL,                   0,                                                              -1, 0, NULL, 0, NULL},
 };
 /* }}} */
 

diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h
index e6c8e28951e8b4475501235fdd046b12f8aa0f14..adafe55c140afb57231dba41fe4ee344a62cbb58 100644 (file)
--- a/ext/mysqli/mysqli_priv.h
+++ b/ext/mysqli/mysqli_priv.h
@@ -52,11 +52,11 @@ extern const mysqli_property_entry mysqli_stmt_property_entries[];
 extern const mysqli_property_entry mysqli_driver_property_entries[];
 extern const mysqli_property_entry mysqli_warning_property_entries[];
 
-extern zend_property_info mysqli_link_property_info_entries[];
-extern zend_property_info mysqli_result_property_info_entries[];
-extern zend_property_info mysqli_stmt_property_info_entries[];
-extern zend_property_info mysqli_driver_property_info_entries[];
-extern zend_property_info mysqli_warning_property_info_entries[];
+extern const zend_property_info mysqli_link_property_info_entries[];
+extern const zend_property_info mysqli_result_property_info_entries[];
+extern const zend_property_info mysqli_stmt_property_info_entries[];
+extern const zend_property_info mysqli_driver_property_info_entries[];
+extern const zend_property_info mysqli_warning_property_info_entries[];
 
 extern int php_le_pmysqli(void);
 extern void php_mysqli_dtor_p_elements(void *data);

diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index 1e272c8d450140deae4d8419ddeaf79a9f60f0dd..8a5eef2dcd564fa38e81cb0ee53877488a10317a 100644 (file)
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -336,26 +336,26 @@ const mysqli_property_entry mysqli_link_property_entries[] = {
        {NULL, 0, NULL, NULL}
 };
 
-/* should not be const, as it is patched during runtime */
-zend_property_info mysqli_link_property_info_entries[] = {
-       {ZEND_ACC_PUBLIC, "affected_rows",      sizeof("affected_rows") - 1,    0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "client_info",        sizeof("client_info") - 1,              0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "client_version",     sizeof("client_version") - 1,   0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "connect_errno",      sizeof("connect_errno") - 1,    0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "connect_error",      sizeof("connect_error") - 1,    0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "errno",                      sizeof("errno") - 1,                    0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "error",                      sizeof("error") - 1,                    0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "field_count",        sizeof("field_count") - 1,              0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "host_info",          sizeof("host_info") - 1,                0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "info",                       sizeof("info") - 1,                             0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "insert_id",          sizeof("insert_id") - 1,                0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "server_info",        sizeof("server_info") - 1,              0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "server_version",     sizeof("server_version") - 1,   0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "sqlstate",           sizeof("sqlstate") - 1,                 0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "protocol_version", sizeof("protocol_version")-1, 0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "thread_id",          sizeof("thread_id") - 1,                0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "warning_count",      sizeof("warning_count") - 1,    0, NULL, 0, NULL},
-       {0,                                     NULL,                   0,                                                              0, NULL, 0, NULL}
+
+const zend_property_info mysqli_link_property_info_entries[] = {
+       {ZEND_ACC_PUBLIC, "affected_rows",      sizeof("affected_rows") - 1,    -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "client_info",        sizeof("client_info") - 1,              -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "client_version",     sizeof("client_version") - 1,   -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "connect_errno",      sizeof("connect_errno") - 1,    -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "connect_error",      sizeof("connect_error") - 1,    -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "errno",                      sizeof("errno") - 1,                    -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "error",                      sizeof("error") - 1,                    -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "field_count",        sizeof("field_count") - 1,              -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "host_info",          sizeof("host_info") - 1,                -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "info",                       sizeof("info") - 1,                             -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "insert_id",          sizeof("insert_id") - 1,                -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "server_info",        sizeof("server_info") - 1,              -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "server_version",     sizeof("server_version") - 1,   -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "sqlstate",           sizeof("sqlstate") - 1,                 -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "protocol_version", sizeof("protocol_version")-1, -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "thread_id",          sizeof("thread_id") - 1,                -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "warning_count",      sizeof("warning_count") - 1,    -1, 0, NULL, 0, NULL},
+       {0,                                     NULL,                   0,                                                              -1, 0, NULL, 0, NULL}
 };
 
 
@@ -368,13 +368,13 @@ const mysqli_property_entry mysqli_result_property_entries[] = {
        {NULL, 0, NULL, NULL}
 };
 
-zend_property_info mysqli_result_property_info_entries[] = {
-       {ZEND_ACC_PUBLIC, "current_field",      sizeof("current_field")-1,      0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "field_count",        sizeof("field_count") - 1,      0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "lengths",            sizeof("lengths") - 1,          0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "num_rows",           sizeof("num_rows") - 1,         0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "type",                       sizeof("type") - 1,             0, NULL, 0, NULL},
-       {0,                                     NULL,                   0,                                                      0, NULL, 0, NULL}
+const zend_property_info mysqli_result_property_info_entries[] = {
+       {ZEND_ACC_PUBLIC, "current_field",      sizeof("current_field")-1,      -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "field_count",        sizeof("field_count") - 1,      -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "lengths",            sizeof("lengths") - 1,          -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "num_rows",           sizeof("num_rows") - 1,         -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "type",                       sizeof("type") - 1,             -1, 0, NULL, 0, NULL},
+       {0,                                     NULL,                   0,                                                      -1, 0, NULL, 0, NULL}
 };
 
 const mysqli_property_entry mysqli_stmt_property_entries[] = {
@@ -391,17 +391,17 @@ const mysqli_property_entry mysqli_stmt_property_entries[] = {
 };
 
 
-zend_property_info mysqli_stmt_property_info_entries[] = {
-       {ZEND_ACC_PUBLIC, "affected_rows", sizeof("affected_rows") - 1, 0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "insert_id",  sizeof("insert_id") - 1,                0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "num_rows",   sizeof("num_rows") - 1,                 0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "param_count",sizeof("param_count") - 1,              0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "field_count",sizeof("field_count") - 1,              0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "errno",              sizeof("errno") - 1,                    0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "error",              sizeof("error") - 1,                    0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "sqlstate",   sizeof("sqlstate") - 1,                 0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "id",                 sizeof("id") - 1,                               0, NULL, 0, NULL},
-       {0,                                     NULL,                   0,                                                      0, NULL, 0, NULL}
+const zend_property_info mysqli_stmt_property_info_entries[] = {
+       {ZEND_ACC_PUBLIC, "affected_rows", sizeof("affected_rows") - 1, -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "insert_id",  sizeof("insert_id") - 1,                -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "num_rows",   sizeof("num_rows") - 1,                 -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "param_count",sizeof("param_count") - 1,              -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "field_count",sizeof("field_count") - 1,              -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "errno",              sizeof("errno") - 1,                    -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "error",              sizeof("error") - 1,                    -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "sqlstate",   sizeof("sqlstate") - 1,                 -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "id",                 sizeof("id") - 1,                               -1, 0, NULL, 0, NULL},
+       {0,                                     NULL,                   0,                                                      -1, 0, NULL, 0, NULL}
 };
 
 /*

diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
index ee815121b3f87cf5c0098f8229d86e968259d1f3..e6d2f516ec4bd7c6700b909d6010c3de550d719b 100644 (file)
--- a/ext/mysqli/mysqli_warning.c
+++ b/ext/mysqli/mysqli_warning.c
@@ -330,11 +330,11 @@ const mysqli_property_entry mysqli_warning_property_entries[] = {
 /* }}} */
 
 /* {{{ mysqli_warning_property_info_entries */
-zend_property_info mysqli_warning_property_info_entries[] = {
-       {ZEND_ACC_PUBLIC, "message",    sizeof("message") - 1,  0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "sqlstate",   sizeof("sqlstate") - 1, 0, NULL, 0, NULL},
-       {ZEND_ACC_PUBLIC, "errno",              sizeof("errno") - 1,    0, NULL, 0, NULL},
-       {0,                                     NULL,                   0,                                      0, NULL, 0, NULL}
+const zend_property_info mysqli_warning_property_info_entries[] = {
+       {ZEND_ACC_PUBLIC, "message",    sizeof("message") - 1,  -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "sqlstate",   sizeof("sqlstate") - 1, -1, 0, NULL, 0, NULL},
+       {ZEND_ACC_PUBLIC, "errno",              sizeof("errno") - 1,    -1, 0, NULL, 0, NULL},
+       {0,                                     NULL,                   0,                                      -1, 0, NULL, 0, NULL}
 };
 /* }}} */