bstr: rename bstr() function to bstr0(), and typedef bstr to struct bstr

Replace all uses of bstr() with bstr0().
Also remove the ridiculous C++ workaround.

1 files changed, 3 insertions, 3 deletions

diff --git a/command.c b/command.c
index 6a32148de8..1f38603aff 100644
--- a/command.c
+++ b/command.c
@@ -226,7 +226,7 @@ static int mp_property_generic_option(struct m_option *prop, int action,
 {
     char *optname = prop->priv;
     const struct m_option *opt = m_config_get_option(mpctx->mconfig,
-                                                     bstr(optname));
+                                                     bstr0(optname));
     void *valptr = m_option_get_ptr(opt, &mpctx->opts);
 
     switch (action) {
@@ -1187,7 +1187,7 @@ static int levels_property_helper(int offset, m_option_t *prop, int action,
 {
     char *optname = prop->priv;
     const struct m_option *opt = m_config_get_option(mpctx->mconfig,
-                                                     bstr(optname));
+                                                     bstr0(optname));
     int *valptr = (int *)m_option_get_ptr(opt, &mpctx->opts);
 
     switch (action) {
@@ -3220,7 +3220,7 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
 
     case MP_CMD_LOADLIST: {
         play_tree_t *e = parse_playlist_file(mpctx->mconfig,
-                                             bstr(cmd->args[0].v.s));
+                                             bstr0(cmd->args[0].v.s));
         if (!e)
             mp_tmsg(MSGT_CPLAYER, MSGL_ERR,
                     "\nUnable to load playlist %s.\n", cmd->args[0].v.s);