diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-30 06:18:13 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-30 06:18:13 +0000 |
| commit | 797a079a95585a07bc7f26a79e04521d3b370177 (patch) | |
| tree | 39e195dd61222e38b934b64d51d3ab37199a0ad3 /ext/satellite/php_orbit.c | |
| parent | e8ac55d03c31304b7a68e5b18c16338dff9a5eb5 (diff) | |
| download | php-git-797a079a95585a07bc7f26a79e04521d3b370177.tar.gz | |
More TSRMLS_FETCH work, and a bit of cleanup
Diffstat (limited to 'ext/satellite/php_orbit.c')
| -rw-r--r-- | ext/satellite/php_orbit.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/ext/satellite/php_orbit.c b/ext/satellite/php_orbit.c index 6b740b9f82..41bb0e06b7 100644 --- a/ext/satellite/php_orbit.c +++ b/ext/satellite/php_orbit.c @@ -80,14 +80,14 @@ static function_entry satellite_functions[] = { * module entry */ zend_module_entry satellite_module_entry = { - "satellite", - satellite_functions, - PHP_MINIT(satellite), /* module startup */ - PHP_MSHUTDOWN(satellite), /* module shutdown */ - NULL, /* request startup */ - NULL, /* request shutdown */ - PHP_MINFO(satellite), /* module info */ - STANDARD_MODULE_PROPERTIES + "satellite", + satellite_functions, + PHP_MINIT(satellite), /* module startup */ + PHP_MSHUTDOWN(satellite), /* module shutdown */ + NULL, /* request startup */ + NULL, /* request shutdown */ + PHP_MINFO(satellite), /* module info */ + STANDARD_MODULE_PROPERTIES }; /* @@ -115,10 +115,8 @@ PHP_MINIT_FUNCTION(satellite) PHP_MSHUTDOWN_FUNCTION(satellite) { TypeManager_Shutdown(); - orbit_corba_shutdown(); - + orbit_corba_shutdown(); UNREGISTER_INI_ENTRIES(); - return SUCCESS; } @@ -132,7 +130,7 @@ PHP_MINFO_FUNCTION(satellite) php_info_print_table_header(2, "CORBA support via Satellite", "enabled"); php_info_print_table_end(); - DISPLAY_INI_ENTRIES(); + DISPLAY_INI_ENTRIES(); } /* instruct the type manager to load an IDL file if not already loaded */ |