cvs: php-src(PHP_5_2) /ext/standard dl.c

jani Thu Sep 13 07:42:12 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard dl.c Log: MFH: cs/ws http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.106.2.1.2.3&r2=1.106.2.1.2.4&diff_format=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.106.2.1.2.3 php-src/ext/standard/dl.c:1.106.2.1.2.4 --- php-src/ext/standard/dl.c:1.106.2.1.2.3 Thu Sep 13 00:56:31 2007 +++ php-src/ext/standard/dl.c Thu Sep 13 07:42:12 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.106.2.1.2.3 2007/09/13 00:56:31 stas Exp $ */ +/* $Id: dl.c,v 1.106.2.1.2.4 2007/09/13 07:42:12 jani Exp $ */ #include "php.h" #include "dl.h" @@ -125,8 +125,8 @@ if (extension_dir && extension_dir[0]){ int extension_dir_len = strlen(extension_dir); - if(type == MODULE_TEMPORARY) { - if(strchr(Z_STRVAL_P(file), '/') != NULL || strchr(Z_STRVAL_P(file), DEFAULT_SLASH) != NULL) { + if (type == MODULE_TEMPORARY) { + if (strchr(Z_STRVAL_P(file), '/') != NULL || strchr(Z_STRVAL_P(file), DEFAULT_SLASH) != NULL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Temporary module name should contain only filename"); RETURN_FALSE; } @@ -196,8 +196,9 @@ int zend_api; unsigned char zend_debug, zts; - if(( ((struct pre_4_1_0_module_entry *)module_entry)->zend_api > 20000000) - &&(((struct pre_4_1_0_module_entry *)module_entry)->zend_api < 20010901)) { + if ((((struct pre_4_1_0_module_entry *)module_entry)->zend_api > 20000000) && + (((struct pre_4_1_0_module_entry *)module_entry)->zend_api < 20010901) + ) { name = ((struct pre_4_1_0_module_entry *)module_entry)->name; zend_api = ((struct pre_4_1_0_module_entry *)module_entry)->zend_api; zend_debug = ((struct pre_4_1_0_module_entry *)module_entry)->zend_debug;