[PHP-CVS] com php-src: constify: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_auth.c ext/mysqlnd/mysqlnd_structs.h

2013-12-16 Thread Joe Watkins 
Commit:225792c5db2306727710d232effb86a3abf09feb
Author:Andrey Hristov and...@php.net Fri, 12 Oct 2012 10:20:09 
+0200
Parents:   7a7b2a06420138d0e0f18a898cb36d007196a922
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=225792c5db2306727710d232effb86a3abf09feb

Log:
constify

Changed paths:
  M  ext/mysqlnd/mysqlnd.c
  M  ext/mysqlnd/mysqlnd_auth.c
  M  ext/mysqlnd/mysqlnd_structs.h


Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index f5fe075..ad91212 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -1924,7 +1924,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, 
free_reference)(MYSQLND_CONN_DATA * co
 
 /* {{{ mysqlnd_conn_data::get_state */
 static enum mysqlnd_connection_state
-MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, get_state)(MYSQLND_CONN_DATA * const 
conn TSRMLS_DC)
+MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, get_state)(const MYSQLND_CONN_DATA * 
const conn TSRMLS_DC)
 {
DBG_ENTER(mysqlnd_conn_data::get_state);
DBG_RETURN(conn-state);
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index f2c5adc..3cae693 100644
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -581,6 +581,7 @@ mysqlnd_sha256_auth_get_auth_data(struct 
st_mysqlnd_authentication_plugin * self
 
 
if (conn-net-data-ssl) {
+   DBG_INF(simple clear text under SSL);
/* clear text under SSL */
*auth_data_len = passwd_len;
ret = malloc(passwd_len);
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 7f512b7..28def72 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -463,7 +463,7 @@ typedef enum_func_status
(*func_mysqlnd_conn_data__query_read_result_set_header)
 
 typedef MYSQLND_CONN_DATA *
(*func_mysqlnd_conn_data__get_reference)(MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
 typedef enum_func_status   
(*func_mysqlnd_conn_data__free_reference)(MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
-typedef enum mysqlnd_connection_state 
(*func_mysqlnd_conn_data__get_state)(MYSQLND_CONN_DATA * const conn TSRMLS_DC);
+typedef enum mysqlnd_connection_state 
(*func_mysqlnd_conn_data__get_state)(const MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
 typedef void   
(*func_mysqlnd_conn_data__set_state)(MYSQLND_CONN_DATA * const conn, enum 
mysqlnd_connection_state new_state TSRMLS_DC);
 
 typedef enum_func_status   
(*func_mysqlnd_conn_data__simple_command)(MYSQLND_CONN_DATA * conn, enum 
php_mysqlnd_server_command command, const zend_uchar * const arg, size_t 
arg_len, enum mysqlnd_packet_type ok_packet, zend_bool silent, zend_bool 
ignore_upsert_status TSRMLS_DC);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: constify: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_auth.c ext/mysqlnd/mysqlnd_structs.h

2012-10-12 Thread Andrey Hristov 
Commit:225792c5db2306727710d232effb86a3abf09feb
Author:Andrey Hristov and...@php.net Fri, 12 Oct 2012 10:20:09 
+0200
Parents:   7a7b2a06420138d0e0f18a898cb36d007196a922
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=225792c5db2306727710d232effb86a3abf09feb

Log:
constify

Changed paths:
  M  ext/mysqlnd/mysqlnd.c
  M  ext/mysqlnd/mysqlnd_auth.c
  M  ext/mysqlnd/mysqlnd_structs.h


Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index f5fe075..ad91212 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -1924,7 +1924,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, 
free_reference)(MYSQLND_CONN_DATA * co
 
 /* {{{ mysqlnd_conn_data::get_state */
 static enum mysqlnd_connection_state
-MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, get_state)(MYSQLND_CONN_DATA * const 
conn TSRMLS_DC)
+MYSQLND_METHOD_PRIVATE(mysqlnd_conn_data, get_state)(const MYSQLND_CONN_DATA * 
const conn TSRMLS_DC)
 {
DBG_ENTER(mysqlnd_conn_data::get_state);
DBG_RETURN(conn-state);
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index f2c5adc..3cae693 100644
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -581,6 +581,7 @@ mysqlnd_sha256_auth_get_auth_data(struct 
st_mysqlnd_authentication_plugin * self
 
 
if (conn-net-data-ssl) {
+   DBG_INF(simple clear text under SSL);
/* clear text under SSL */
*auth_data_len = passwd_len;
ret = malloc(passwd_len);
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 7f512b7..28def72 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -463,7 +463,7 @@ typedef enum_func_status
(*func_mysqlnd_conn_data__query_read_result_set_header)
 
 typedef MYSQLND_CONN_DATA *
(*func_mysqlnd_conn_data__get_reference)(MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
 typedef enum_func_status   
(*func_mysqlnd_conn_data__free_reference)(MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
-typedef enum mysqlnd_connection_state 
(*func_mysqlnd_conn_data__get_state)(MYSQLND_CONN_DATA * const conn TSRMLS_DC);
+typedef enum mysqlnd_connection_state 
(*func_mysqlnd_conn_data__get_state)(const MYSQLND_CONN_DATA * const conn 
TSRMLS_DC);
 typedef void   
(*func_mysqlnd_conn_data__set_state)(MYSQLND_CONN_DATA * const conn, enum 
mysqlnd_connection_state new_state TSRMLS_DC);
 
 typedef enum_func_status   
(*func_mysqlnd_conn_data__simple_command)(MYSQLND_CONN_DATA * conn, enum 
php_mysqlnd_server_command command, const zend_uchar * const arg, size_t 
arg_len, enum mysqlnd_packet_type ok_packet, zend_bool silent, zend_bool 
ignore_upsert_status TSRMLS_DC);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php