nlopess Fri Jan 25 19:58:51 2008 UTC
Modified files:
/php-src/ext/pdo pdo_sqlstate.c
Log:
MFB: move data to const segment
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sqlstate.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/pdo/pdo_sqlstate.c
diff -u php-src/ext/pdo/pdo_sqlstate.c:1.11 php-src/ext/pdo/pdo_sqlstate.c:1.12
--- php-src/ext/pdo/pdo_sqlstate.c:1.11 Mon Dec 31 07:12:13 2007
+++ php-src/ext/pdo/pdo_sqlstate.c Fri Jan 25 19:58:51 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sqlstate.c,v 1.11 2007/12/31 07:12:13 sebastian Exp $ */
+/* $Id: pdo_sqlstate.c,v 1.12 2008/01/25 19:58:51 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -29,13 +29,13 @@
#include "php_pdo_driver.h"
struct pdo_sqlstate_info {
- char state[6];
+ const char state[5];
const char *desc;
};
static HashTable err_hash;
-static struct pdo_sqlstate_info err_initializer[] = {
+static const struct pdo_sqlstate_info err_initializer[] = {
{ "00000", "No error" },
{ "01000", "Warning" },
{ "01001", "Cursor operation conflict" },
@@ -312,7 +312,7 @@
int pdo_sqlstate_init_error_table(void)
{
int i;
- struct pdo_sqlstate_info *info;
+ const struct pdo_sqlstate_info *info;
if (FAILURE == zend_hash_init(&err_hash,
sizeof(err_initializer)/sizeof(err_initializer[0]),
NULL, NULL, 1)) {
@@ -330,7 +330,7 @@
const char *pdo_sqlstate_state_to_description(char *state)
{
- struct pdo_sqlstate_info **info;
+ const struct pdo_sqlstate_info **info;
if (SUCCESS == zend_hash_find(&err_hash, state,
sizeof(err_initializer[0].state),
(void**)&info)) {
return (*info)->desc;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
