From 04c02796bd371e65f81a92b853658b8fbadb7ad5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 9 May 2015 15:26:47 +0200 Subject: path: make mp_path_join accept normal C strings Instead of bstr. Most callers of this function do not need bstr. The bstr version of this function is now mp_path_join_bstr(). --- player/configfiles.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'player/configfiles.c') diff --git a/player/configfiles.c b/player/configfiles.c index 52cd837ab7..984a0fd02e 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -117,7 +117,7 @@ static void mp_load_per_file_config(struct MPContext *mpctx) char *name = mp_basename(cfg); bstr dir = mp_dirname(cfg); - char *dircfg = mp_path_join(NULL, dir, bstr0("mpv.conf")); + char *dircfg = mp_path_join_bstr(NULL, dir, bstr0("mpv.conf")); try_load_config(mpctx, dircfg, FILE_LOCAL_FLAGS); talloc_free(dircfg); @@ -181,7 +181,7 @@ static char *mp_get_playback_resume_config_filename(struct mpv_global *global, char *cwd = mp_getcwd(tmp); if (!cwd) goto exit; - realpath = mp_path_join(tmp, bstr0(cwd), bstr0(fname)); + realpath = mp_path_join(tmp, cwd, fname); } } if (bstr_startswith0(bfname, "dvd://")) -- cgit v1.2.3