summaryrefslogtreecommitdiffstats
path: root/options/path.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-09 15:26:47 +0200
committerwm4 <wm4@nowhere>2015-05-09 15:26:47 +0200
commit04c02796bd371e65f81a92b853658b8fbadb7ad5 (patch)
tree75b09115e17eedbf06cb3233eb145a5c19f72b58 /options/path.h
parent40997b8ae5b4065b3e71d4369eaba14c991e5027 (diff)
downloadmpv-04c02796bd371e65f81a92b853658b8fbadb7ad5.tar.bz2
mpv-04c02796bd371e65f81a92b853658b8fbadb7ad5.tar.xz
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().
Diffstat (limited to 'options/path.h')
-rw-r--r--options/path.h3
1 files changed, 2 insertions, 1 deletions
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);