Skip to content

Commit 9ad0d0c

Browse files
committed
replace the stack var by a macro
1 parent 9470b20 commit 9ad0d0c

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

ext/standard/dl.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,15 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now)
116116
} else {
117117
spprintf(&libpath, 0, "%s%c%s", extension_dir, DEFAULT_SLASH, filename); /* SAFE */
118118
}
119+
119120
if (VCWD_ACCESS(libpath, F_OK)) {
120121
/* If file does not exist, consider as extension name and build file name */
121-
const char *libpath_prefix = "";
122122
char *orig_libpath = libpath;
123-
#if PHP_WIN32
124-
libpath_prefix = "php_";
125-
#endif
123+
126124
if (slash_suffix) {
127-
spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */
125+
spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */
128126
} else {
129-
spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */
127+
spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */
130128
}
131129

132130
if (VCWD_ACCESS(libpath, F_OK)) {

main/build-defs.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@
8989
#define PHP_CONFIG_FILE_PATH "@EXPANDED_PHP_CONFIG_FILE_PATH@"
9090
#define PHP_CONFIG_FILE_SCAN_DIR "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
9191
#define PHP_SHLIB_SUFFIX "@SHLIB_DL_SUFFIX_NAME@"
92+
#define PHP_SHLIB_EXT_PREFIX ""

main/php_ini.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,16 +375,12 @@ static void php_load_zend_extension_cb(void *arg)
375375

376376
if (VCWD_ACCESS(libpath, F_OK)) {
377377
/* If file does not exist, consider as extension name and build file name */
378-
const char *libpath_prefix = "";
379378
char *orig_libpath = libpath;
380-
#if PHP_WIN32
381-
libpath_prefix = "php_";
382-
#endif
383379

384380
if (slash_suffix) {
385-
spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */
381+
spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */
386382
} else {
387-
spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */
383+
spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */
388384
}
389385

390386
if (VCWD_ACCESS(libpath, F_OK)) {

win32/build/config.w32.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
#define HAVE_FNMATCH
137137
#define HAVE_GLOB
138138
#define PHP_SHLIB_SUFFIX "dll"
139+
#define PHP_SHLIB_EXT_PREFIX "php_"
139140
#define HAVE_SQLDATASOURCES
140141

141142
/* Win32 supports strcoll */

0 commit comments

Comments
 (0)