diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-05-05 23:34:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-05 23:34:19 +0300 |
commit | c246e0c3b6bfd4c57d12f8c3b232968b59757e26 (patch) | |
tree | 2043ae33a4acef91fa4749426930512daf3a206a /source/blender | |
parent | e00142bfa73ace6ba2e66923e3c36b08b72c57ed (diff) |
Prefer name 'program' over 'binary'
binary-search is confusing!
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/appdir.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_path_util.h | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 33ef53eb2e0..61aa0eb617a 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -556,18 +556,18 @@ static void bli_where_am_i(char *fullname, const size_t maxlen, const char *name BLI_join_dirfile(fullname, maxlen, wdir, name); #ifdef _WIN32 - BLI_path_binary_extensions_add_win32(fullname, maxlen); + BLI_path_program_extensions_add_win32(fullname, maxlen); #endif } else if (BLI_last_slash(name)) { // full path BLI_strncpy(fullname, name, maxlen); #ifdef _WIN32 - BLI_path_binary_extensions_add_win32(fullname, maxlen); + BLI_path_program_extensions_add_win32(fullname, maxlen); #endif } else { - BLI_path_binary_search(fullname, maxlen, name); + BLI_path_program_search(fullname, maxlen, name); } #if defined(DEBUG) if (!STREQ(name, fullname)) { diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 0513625772d..30b57c5f41b 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -79,9 +79,9 @@ const char *BLI_first_slash(const char *string) ATTR_NONNULL() ATTR_WARN_UNUSED_ void BLI_path_native_slash(char *path) ATTR_NONNULL(); #ifdef _WIN32 -bool BLI_path_binary_extensions_add_win32(char *name, const size_t maxlen); +bool BLI_path_program_extensions_add_win32(char *name, const size_t maxlen); #endif -bool BLI_path_binary_search(char *fullname, const size_t maxlen, const char *name); +bool BLI_path_program_search(char *fullname, const size_t maxlen, const char *name); void BLI_getlastdir(const char *dir, char *last, const size_t maxlen); bool BLI_testextensie(const char *str, const char *ext) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT; diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 67b28e82796..b079478f397 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1026,7 +1026,7 @@ bool BLI_path_cwd(char *path) * environment variable (Windows-only) onto *name in turn until such a file is found. * Returns success/failure. */ -bool BLI_path_binary_extensions_add_win32(char *name, const size_t maxlen) +bool BLI_path_program_extensions_add_win32(char *name, const size_t maxlen) { bool retval = false; int type; @@ -1071,7 +1071,7 @@ bool BLI_path_binary_extensions_add_win32(char *name, const size_t maxlen) /** * Search for a binary (executable) */ -bool BLI_path_binary_search( +bool BLI_path_program_search( char *fullname, const size_t maxlen, const char *name) { @@ -1103,7 +1103,7 @@ bool BLI_path_binary_search( BLI_path_append(filename, maxlen, name); if ( #ifdef _WIN32 - BLI_path_binary_extensions_add_win32(filename, maxlen) + BLI_path_program_extensions_add_win32(filename, maxlen) #else BLI_exists(filename) #endif |