cvs: php-src /ext/mysqlnd mysqlnd.c mysqlnd_priv.h

johannes Tue Aug 19 10:42:01 2008 UTC Modified files: /php-src/ext/mysqlnd mysqlnd.c mysqlnd_priv.h Log: constify strings http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.26&r2=1.27&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd.c diff -u php-src/ext/mysqlnd/mysqlnd.c:1.26 php-src/ext/mysqlnd/mysqlnd.c:1.27 --- php-src/ext/mysqlnd/mysqlnd.c:1.26 Tue Aug 19 10:15:56 2008 +++ php-src/ext/mysqlnd/mysqlnd.c Tue Aug 19 10:42:00 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd.c,v 1.26 2008/08/19 10:15:56 johannes Exp $ */ +/* $Id: mysqlnd.c,v 1.27 2008/08/19 10:42:00 johannes Exp $ */ #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" @@ -58,9 +58,9 @@ -const char * mysqlnd_old_passwd = "mysqlnd cannot connect to MySQL 4.1+ using old authentication"; -const char * mysqlnd_server_gone = "MySQL server has gone away"; -const char * mysqlnd_out_of_sync = "Commands out of sync; you can't run this command now"; +const char * const mysqlnd_old_passwd = "mysqlnd cannot connect to MySQL 4.1+ using old authentication"; +const char * const mysqlnd_server_gone = "MySQL server has gone away"; +const char * const mysqlnd_out_of_sync = "Commands out of sync; you can't run this command now"; MYSQLND_STATS *mysqlnd_global_stats = NULL; static zend_bool mysqlnd_library_initted = FALSE; http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_priv.h?r1=1.15&r2=1.16&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_priv.h diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.15 php-src/ext/mysqlnd/mysqlnd_priv.h:1.16 --- php-src/ext/mysqlnd/mysqlnd_priv.h:1.15 Thu Apr 24 14:04:58 2008 +++ php-src/ext/mysqlnd/mysqlnd_priv.h Tue Aug 19 10:42:00 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_priv.h,v 1.15 2008/04/24 14:04:58 andrey Exp $ */ +/* $Id: mysqlnd_priv.h,v 1.16 2008/08/19 10:42:00 johannes Exp $ */ #ifndef MYSQLND_PRIV_H #define MYSQLND_PRIV_H @@ -163,8 +163,9 @@ extern struct st_mysqlnd_perm_bind mysqlnd_ps_fetch_functions[MYSQL_TYPE_LAST + 1]; -extern const char * mysqlnd_out_of_sync; -extern const char * mysqlnd_server_gone; +extern const char * const mysqlnd_old_passwd; +extern const char * const mysqlnd_out_of_sync; +extern const char * const mysqlnd_server_gone; enum_func_status mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_warning TSRMLS_DC);