diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-07 05:23:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-07 05:26:23 +0300 |
commit | 0964865568802aba62737d899d6721ef5c58b63a (patch) | |
tree | 7e85df6a34a192085f94d181ba53d268bc6c1632 /source/blender/windowmanager/intern/wm_files.c | |
parent | 8fb1ea857ffef370acb020f6573c165100923e1b (diff) |
Cleanup: replace BLI_make_file_string with BLI_join_dirfile where possible
Use 'BLI_join_dirfile' for joining paths that don't need to expand '//'.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 1ce56ad2dfc..83355ecb786 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1088,7 +1088,7 @@ void wm_history_file_read(void) return; } - BLI_make_file_string("/", name, cfgdir, BLENDER_HISTORY_FILE); + BLI_join_dirfile(name, sizeof(name), cfgdir, BLENDER_HISTORY_FILE); lines = BLI_file_read_as_lines(name); @@ -1144,7 +1144,7 @@ static void wm_history_file_write(void) return; } - BLI_make_file_string("/", name, user_config_dir, BLENDER_HISTORY_FILE); + BLI_join_dirfile(name, sizeof(name), user_config_dir, BLENDER_HISTORY_FILE); fp = BLI_fopen(name, "w"); if (fp) { @@ -1487,7 +1487,7 @@ void wm_autosave_location(char *filepath) } #endif - BLI_make_file_string("/", filepath, BKE_tempdir_base(), path); + BLI_join_dirfile(filepath, FILE_MAX, BKE_tempdir_base(), path); } void WM_autosave_init(wmWindowManager *wm) @@ -1559,7 +1559,7 @@ void wm_autosave_delete(void) if (BLI_exists(filename)) { char str[FILE_MAX]; - BLI_make_file_string("/", str, BKE_tempdir_base(), BLENDER_QUIT_FILE); + BLI_join_dirfile(str, sizeof(str), BKE_tempdir_base(), BLENDER_QUIT_FILE); /* if global undo; remove tempsave, otherwise rename */ if (U.uiflag & USER_GLOBALUNDO) { @@ -2439,7 +2439,7 @@ void WM_recover_last_session(bContext *C, ReportList *reports) { char filepath[FILE_MAX]; - BLI_make_file_string("/", filepath, BKE_tempdir_base(), BLENDER_QUIT_FILE); + BLI_join_dirfile(filepath, sizeof(filepath), BKE_tempdir_base(), BLENDER_QUIT_FILE); /* if reports==NULL, it's called directly without operator, we add a quick check here */ if (reports || BLI_exists(filepath)) { G.fileflags |= G_FILE_RECOVER; |