cvs: php4 /ext/mssql php_mssql.c

fmk Thu Nov 30 14:24:02 2000 EDT Modified files: /php4/ext/mssql php_mssql.c Log: Changed presentation of default values for textsize and textlimit in phpinfo(). the value -1 means "Server default" Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.34 php4/ext/mssql/php_mssql.c:1.35 --- php4/ext/mssql/php_mssql.c:1.34 Wed Nov 29 14:06:47 2000 +++ php4/ext/mssql/php_mssql.c Thu Nov 30 14:24:00 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.34 2000/11/29 22:06:47 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.35 2000/11/30 22:24:00 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -75,11 +75,7 @@ STANDARD_MODULE_PROPERTIES }; -#ifdef ZTS -int mssql_globals_id; -#else -PHP_MSSQL_API zend_mssql_globals mssql_globals; -#endif +ZEND_DECLARE_MODULE_GLOBALS(mssql) #ifdef COMPILE_DL_MSSQL ZEND_GET_MODULE(mssql) @@ -87,6 +83,24 @@ #define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING,"MS SQL: A link to the server could not be established"); RETURN_FALSE; } } +static PHP_INI_DISP(display_text_size) +{ + char *value; + + if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) { + value = ini_entry->orig_value; + } else if (ini_entry->value) { + value = ini_entry->value; + } else { + value = NULL; + } + + if (atoi(value) == -1) { + PUTS("Server default"); + } else { + php_printf("%s", value); + } +} PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("mssql.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateBool, allow_persistent, zend_mssql_globals, mssql_globals) @@ -96,8 +110,8 @@ STD_PHP_INI_ENTRY_EX("mssql.min_message_severity", "10", PHP_INI_ALL, OnUpdateInt, cfg_min_message_severity, zend_mssql_globals, mssql_globals, display_link_numbers) STD_PHP_INI_BOOLEAN("mssql.compatability_mode", "0", PHP_INI_ALL, OnUpdateBool, compatability_mode, zend_mssql_globals, mssql_globals) STD_PHP_INI_ENTRY_EX("mssql.connect_timeout", "5", PHP_INI_ALL, OnUpdateInt, connect_timeout, zend_mssql_globals, mssql_globals, display_link_numbers) - STD_PHP_INI_ENTRY_EX("mssql.textsize", "-1", PHP_INI_ALL, OnUpdateInt, textsize, zend_mssql_globals, mssql_globals, display_link_numbers) - STD_PHP_INI_ENTRY_EX("mssql.textlimit", "-1", PHP_INI_ALL, OnUpdateInt, textlimit, zend_mssql_globals, mssql_globals, display_link_numbers) + STD_PHP_INI_ENTRY_EX("mssql.textsize", "-1", PHP_INI_ALL, OnUpdateInt, textsize, zend_mssql_globals, mssql_globals, display_text_size) + STD_PHP_INI_ENTRY_EX("mssql.textlimit", "-1", PHP_INI_ALL, OnUpdateInt, textlimit, zend_mssql_globals, mssql_globals, display_text_size) STD_PHP_INI_ENTRY_EX("mssql.batchsize", "0", PHP_INI_ALL, OnUpdateInt, batchsize, zend_mssql_globals, mssql_globals, display_link_numbers) PHP_INI_END()