diff options
| author | Mark Spruiell <mes@zeroc.com> | 2007-04-18 20:56:02 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2007-04-18 20:56:02 +0000 |
| commit | 352a8a91b04b16fd7cd284a5c98c4d58a8d6fe34 (patch) | |
| tree | 55d1e4e729f4a7b5c6a684ba12c3be4873c26446 /php/src/IcePHP/Init.cpp | |
| parent | bug 1493: removing use of NULL bug 1852: fixing compiler warnings bug 1853: (diff) | |
| download | ice-352a8a91b04b16fd7cd284a5c98c4d58a8d6fe34.tar.bz2 ice-352a8a91b04b16fd7cd284a5c98c4d58a8d6fe34.tar.xz ice-352a8a91b04b16fd7cd284a5c98c4d58a8d6fe34.zip | |
bug 2098; misc. code cleanup
Diffstat (limited to 'php/src/IcePHP/Init.cpp')
| -rw-r--r-- | php/src/IcePHP/Init.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/php/src/IcePHP/Init.cpp b/php/src/IcePHP/Init.cpp index 1a0a56fc6bf..4a688558ee3 100644 --- a/php/src/IcePHP/Init.cpp +++ b/php/src/IcePHP/Init.cpp @@ -27,7 +27,7 @@ function_entry ice_functions[] = ICE_PHP_IDENTITY_FUNCTIONS ICE_PHP_PROXY_FUNCTIONS ICE_PHP_PROFILE_FUNCTIONS - {NULL, NULL, NULL} + {0, 0, 0} }; zend_module_entry ice_module_entry = @@ -50,16 +50,16 @@ ZEND_GET_MODULE(ice) // Declare initialization file entries. // PHP_INI_BEGIN() - PHP_INI_ENTRY("ice.config", "", PHP_INI_SYSTEM, NULL) - PHP_INI_ENTRY("ice.options", "", PHP_INI_SYSTEM, NULL) - PHP_INI_ENTRY("ice.profiles", "", PHP_INI_SYSTEM, NULL) - PHP_INI_ENTRY("ice.slice", "", PHP_INI_SYSTEM, NULL) + PHP_INI_ENTRY("ice.config", "", PHP_INI_SYSTEM, 0) + PHP_INI_ENTRY("ice.options", "", PHP_INI_SYSTEM, 0) + PHP_INI_ENTRY("ice.profiles", "", PHP_INI_SYSTEM, 0) + PHP_INI_ENTRY("ice.slice", "", PHP_INI_SYSTEM, 0) PHP_INI_END() extern "C" int initIceGlobals(zend_ice_globals* g) { - g->communicator = NULL; + g->communicator = 0; g->marshalerMap = 0; g->profile = 0; g->properties = 0; @@ -69,7 +69,7 @@ int initIceGlobals(zend_ice_globals* g) ZEND_MINIT_FUNCTION(ice) { REGISTER_INI_ENTRIES(); - ZEND_INIT_MODULE_GLOBALS(ice, initIceGlobals, NULL); + ZEND_INIT_MODULE_GLOBALS(ice, initIceGlobals, 0); if(!profileInit(TSRMLS_C)) { @@ -105,7 +105,7 @@ ZEND_MSHUTDOWN_FUNCTION(ice) ZEND_RINIT_FUNCTION(ice) { - ICE_G(communicator) = NULL; + ICE_G(communicator) = 0; ICE_G(marshalerMap) = new MarshalerMap; ICE_G(profile) = 0; ICE_G(properties) = 0; @@ -133,7 +133,7 @@ ZEND_RSHUTDOWN_FUNCTION(ice) for(ObjectFactoryMap::iterator p = ofm->begin(); p != ofm->end(); ++p) { zval* factory = p->second; - zend_call_method_with_0_params(&factory, NULL, NULL, "destroy", NULL); + zend_call_method_with_0_params(&factory, 0, 0, "destroy", 0); zval_ptr_dtor(&factory); } delete ofm; |