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(). --- options/path.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'options/path.h') diff --git a/options/path.h b/options/path.h index 7f9c0cb685..1facea81cf 100644 --- a/options/path.h +++ b/options/path.h @@ -63,7 +63,8 @@ struct bstr mp_dirname(const char *path); * for the result. '/' is inserted between the components if needed. * If p2 is an absolute path then the value of p1 is ignored. */ -char *mp_path_join(void *talloc_ctx, struct bstr p1, struct bstr p2); +char *mp_path_join(void *talloc_ctx, const char *p1, const char *p2); +char *mp_path_join_bstr(void *talloc_ctx, struct bstr p1, struct bstr p2); char *mp_getcwd(void *talloc_ctx); -- cgit v1.2.3