cvs: php4 /ext/standard dl.c

derick Thu Sep 5 10:32:47 2002 EDT Modified files: /php4/ext/standard dl.c Log: - Please use tabs for indentation Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.71 php4/ext/standard/dl.c:1.72 --- php4/ext/standard/dl.c:1.71 Thu Sep 5 10:21:55 2002 +++ php4/ext/standard/dl.c Thu Sep 5 10:32:47 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.71 2002/09/05 14:21:55 hyanantha Exp $ */ +/* $Id: dl.c,v 1.72 2002/09/05 14:32:47 derick Exp $ */ #include "php.h" #include "dl.h" @@ -161,21 +161,21 @@ if (!get_module) get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, "_get_module"); -#else +#else /* NetWare doesn't support two NLMs exporting same symbol */ - { - char symbol_name[64] = "\0"; - int module_name_length = Z_STRLEN_P(file) - 4; /* '.nlm' is 4 characters; knock it off */ - - /* Take the module name (e.g.: 'php_ldap') and append '@get_module' to it */ - strncpy(symbol_name, Z_STRVAL_P(file), module_name_length); - symbol_name[module_name_length] = '\0'; - strcat(symbol_name, "@"); - strcat(symbol_name, "get_module"); + { + char symbol_name[64] = "\0"; + int module_name_length = Z_STRLEN_P(file) - 4; /* '.nlm' is 4 characters; knock it off */ + + /* Take the module name (e.g.: 'php_ldap') and append '@get_module' to it */ + strncpy(symbol_name, Z_STRVAL_P(file), module_name_length); + symbol_name[module_name_length] = '\0'; + strcat(symbol_name, "@"); + strcat(symbol_name, "get_module"); - get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, symbol_name); + get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, symbol_name); } - /* NetWare doesn't prepend '_' to symbol names; so the corresponding portion of code is also + /* NetWare doesn't prepend '_' to symbol names; so the corresponding portion of code is also not required for NetWare */ #endif @@ -231,7 +231,7 @@ "PHP compiled with module API=%d, debug=%d, thread-safety=%d\n" "These options need to match\n", name, zend_api, zend_debug, zts, - ZEND_MODULE_API_NO, ZEND_DEBUG, USING_ZTS); + ZEND_MODULE_API_NO, ZEND_DEBUG, USING_ZTS); DL_UNLOAD(handle); RETURN_FALSE; }