diff options
| -rw-r--r-- | ext/interbase/interbase.c | 13 | ||||
| -rw-r--r-- | ext/interbase/php_interbase.h | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index d1bbff7a6e..b44eda851c 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -34,6 +34,8 @@ A lot... */ emalloc() with do_alloca() - Changes to ibase_query() to enable the use of CREATE DATABASE ... - Added ibase_drop_db() + - Added ibase_commit_ret() and ibase_rollback_ret() + - Added ibase_name_result() 2001-05-31: Jeremy Bettis <jeremy@deadbeef.com> - If a blob handle was expected and something else was received create a blob and add the value to it. @@ -575,7 +577,6 @@ static void php_ibase_init_globals(zend_ibase_globals *ibase_globals) ibase_globals->timestampformat = NULL; ibase_globals->dateformat = NULL; ibase_globals->timeformat = NULL; - ibase_globals->errmsg = NULL; ibase_globals->num_persistent = 0; } @@ -632,10 +633,7 @@ PHP_RINIT_FUNCTION(ibase) } IBG(timeformat) = DL_STRDUP(IBG(cfg_timeformat)); - if (IBG(errmsg)) { - DL_FREE(IBG(errmsg)); - } - IBG(errmsg) = DL_MALLOC(sizeof(char)*MAX_ERRMSG+1); + RESET_ERRMSG; return SUCCESS; } @@ -663,11 +661,6 @@ PHP_RSHUTDOWN_FUNCTION(ibase) } IBG(timeformat) = NULL; - if (IBG(errmsg)) { - DL_FREE(IBG(errmsg)); - } - IBG(errmsg) = NULL; - return SUCCESS; } diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h index c40e0217ea..4a7798f241 100644 --- a/ext/interbase/php_interbase.h +++ b/ext/interbase/php_interbase.h @@ -102,7 +102,7 @@ ZEND_BEGIN_MODULE_GLOBALS(ibase) char *cfg_dateformat; char *timeformat; char *cfg_timeformat; - char *errmsg; + char errmsg[MAX_ERRMSG]; ZEND_END_MODULE_GLOBALS(ibase) typedef struct { |