com php-src: replace the stack var by a macro: ext/standard/dl.c main/build-defs.h.in main/php_ini.c win32/build/confi g.w32.h.in

Commit: 9ad0d0ca3c25306f78b5bf08949b10ca516f614c Author: Anatol Belski <ab@php.net> Thu, 6 Jul 2017 20:47:04 +0200 Parents: 9470b2016cf941732c3144598eb7db195446d910 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ad0d0ca3c25306f78b5bf08949b10ca516f614c Log: replace the stack var by a macro Changed paths: M ext/standard/dl.c M main/build-defs.h.in M main/php_ini.c M win32/build/config.w32.h.in Diff: diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 0505166..5adae80 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -116,17 +116,15 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now) } else { spprintf(&libpath, 0, "%s%c%s", extension_dir, DEFAULT_SLASH, filename); /* SAFE */ } + if (VCWD_ACCESS(libpath, F_OK)) { /* If file does not exist, consider as extension name and build file name */ - const char *libpath_prefix = ""; char *orig_libpath = libpath; -#if PHP_WIN32 - libpath_prefix = "php_"; -#endif + if (slash_suffix) { - spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */ + spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */ } else { - spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */ + spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */ } if (VCWD_ACCESS(libpath, F_OK)) { diff --git a/main/build-defs.h.in b/main/build-defs.h.in index c82982a..fb9bc7f 100644 --- a/main/build-defs.h.in +++ b/main/build-defs.h.in @@ -89,3 +89,4 @@ #define PHP_CONFIG_FILE_PATH "@EXPANDED_PHP_CONFIG_FILE_PATH@" #define PHP_CONFIG_FILE_SCAN_DIR "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@" #define PHP_SHLIB_SUFFIX "@SHLIB_DL_SUFFIX_NAME@" +#define PHP_SHLIB_EXT_PREFIX "" diff --git a/main/php_ini.c b/main/php_ini.c index 8b53f30..98896a5 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -375,16 +375,12 @@ static void php_load_zend_extension_cb(void *arg) if (VCWD_ACCESS(libpath, F_OK)) { /* If file does not exist, consider as extension name and build file name */ - const char *libpath_prefix = ""; char *orig_libpath = libpath; -#if PHP_WIN32 - libpath_prefix = "php_"; -#endif if (slash_suffix) { - spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */ + spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */ } else { - spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */ + spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */ } if (VCWD_ACCESS(libpath, F_OK)) { diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 573eb95..9572f65 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -136,6 +136,7 @@ #define HAVE_FNMATCH #define HAVE_GLOB #define PHP_SHLIB_SUFFIX "dll" +#define PHP_SHLIB_EXT_PREFIX "php_" #define HAVE_SQLDATASOURCES /* Win32 supports strcoll */