[PHP4BETA] CVS update: php4/ext/odbc

Date: Wednesday April 28, 1999 @ 16:26 Author: zeev Update of /repository/php4/ext/odbc In directory php:/tmp/cvs-serv32082/ext/odbc Modified Files: odbc.c Log Message: A step towards generalizing the INI mechanism even more Index: php4/ext/odbc/odbc.c diff -u php4/ext/odbc/odbc.c:1.5 php4/ext/odbc/odbc.c:1.6 --- php4/ext/odbc/odbc.c:1.5 Fri Apr 23 20:11:54 1999 +++ php4/ext/odbc/odbc.c Wed Apr 28 16:26:32 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: odbc.c,v 1.5 1999/04/24 00:11:54 zeev Exp $ */ +/* $Id: odbc.c,v 1.6 1999/04/28 20:26:32 zeev Exp $ */ /* This file is based on the Adabas D extension. * Adabas D will no longer be supported as separate module. @@ -189,7 +189,7 @@ long *p; ODBC_TLS_VARS; - p = (long *) (globals + (size_t)mh_arg); + p = (long *) (globals + (size_t)mh_arg1); *p = atoi(new_value); return SUCCESS; @@ -201,7 +201,7 @@ char **p; ODBC_TLS_VARS; - p = (char **) (globals + (size_t)mh_arg); + p = (char **) (globals + (size_t)mh_arg1); *p = new_value; return SUCCESS; @@ -209,14 +209,14 @@ PHP_INI_BEGIN() - PHP_INI_ENTRY("odbc.allow_persistent", "1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, allow_persistent)) - PHP_INI_ENTRY("odbc.max_persistent", "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_persistent)) - PHP_INI_ENTRY("odbc.max_links", "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_links)) - PHP_INI_ENTRY("odbc.default_db", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defDB)) - PHP_INI_ENTRY("odbc.default_user", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defUser)) - PHP_INI_ENTRY("odbc.default_pw", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW)) - PHP_INI_ENTRY("odbc.defaultlrl", "4096", PHP_INI_ALL, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, defaultlrl)) - PHP_INI_ENTRY("odbc.defaultbinmode", "1", PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW)) + PHP_INI_ENTRY1("odbc.allow_persistent", "1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, allow_persistent)) + PHP_INI_ENTRY1("odbc.max_persistent", "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_persistent)) + PHP_INI_ENTRY1("odbc.max_links", "-1", PHP_INI_SYSTEM, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, max_links)) + PHP_INI_ENTRY1("odbc.default_db", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defDB)) + PHP_INI_ENTRY1("odbc.default_user", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defUser)) + PHP_INI_ENTRY1("odbc.default_pw", NULL, PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW)) + PHP_INI_ENTRY1("odbc.defaultlrl", "4096", PHP_INI_ALL, odbc_param_int, (void *)XtOffsetOf(php_odbc_globals, defaultlrl)) + PHP_INI_ENTRY1("odbc.defaultbinmode", "1", PHP_INI_ALL, odbc_param_str, (void *)XtOffsetOf(php_odbc_globals, defPW)) PHP_INI_END() -- PHP 4 Beta