From 9f6a045e23cf4ab132ef78eeaf070bd53d0c509f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 17 Oct 2022 11:30:48 +1100 Subject: Cleanup: replace BLI_join_dirfile with BLI_path_join These functions are almost identical, the main difference being BLI_join_dirfile didn't trim existing slashes when joining paths however this isn't an important difference that warrants a separate function. --- source/creator/creator_signals.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/creator') diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c index f67c4dde41d..c733ee617cb 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c @@ -101,7 +101,7 @@ static void sig_handle_crash(int signum) char fname[FILE_MAX]; if (!(G_MAIN && G_MAIN->filepath[0])) { - BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), "crash.blend"); + BLI_path_join(fname, sizeof(fname), BKE_tempdir_base(), "crash.blend"); } else { STRNCPY(fname, G_MAIN->filepath); @@ -122,11 +122,10 @@ static void sig_handle_crash(int signum) char fname[FILE_MAX]; if (!(G_MAIN && G_MAIN->filepath[0])) { - BLI_join_dirfile(fname, sizeof(fname), BKE_tempdir_base(), "blender.crash.txt"); + BLI_path_join(fname, sizeof(fname), BKE_tempdir_base(), "blender.crash.txt"); } else { - BLI_join_dirfile( - fname, sizeof(fname), BKE_tempdir_base(), BLI_path_basename(G_MAIN->filepath)); + BLI_path_join(fname, sizeof(fname), BKE_tempdir_base(), BLI_path_basename(G_MAIN->filepath)); BLI_path_extension_replace(fname, sizeof(fname), ".crash.txt"); } -- cgit v1.2.3