diff options
| author | Campbell Barton <campbell@blender.org> | 2022-10-17 03:16:41 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-10-17 03:16:41 +0300 |
| commit | 1d1cade9a9a7f75034669520e39c56959917803a (patch) | |
| tree | 92482d85f4199f1f65ebcb4b04b6c2cf4a4a0ea4 /source/blender/blenloader | |
| parent | 2f3f208901b5bf0fde7fbc9c3f02b66f7591b169 (diff) | |
BLI_path: remove trailing NULL argument to BLI_path_join
Using varargs had the disadvantages, replace with a macro which has
some advantages.
- Arguments are type checked.
- Less verbose.
- Unintended NULL arguments would silently terminate joining paths.
- Passing in a NULL argument warns with GCC.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/tests/blendfile_loading_base_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc index 615e30a728e..b657970d45f 100644 --- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc +++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc @@ -117,7 +117,7 @@ bool BlendfileLoadingBaseTest::blendfile_load(const char *filepath) } char abspath[FILENAME_MAX]; - BLI_path_join(abspath, sizeof(abspath), test_assets_dir.c_str(), filepath, nullptr); + BLI_path_join(abspath, sizeof(abspath), test_assets_dir.c_str(), filepath); BlendFileReadReport bf_reports = {nullptr}; bfile = BLO_read_from_file(abspath, BLO_READ_SKIP_NONE, &bf_reports); |