Browse Source

Fixed indentation and removed leaky, unnecessary xdg_config_home and xdg_state_home variables

pull/967/head
Keith Bowes 1 year ago
parent
commit
b7b60c947b
1 changed files with 13 additions and 13 deletions
  1. +13
    -13
      dbus/jackdbus.c

+ 13
- 13
dbus/jackdbus.c View File

@@ -694,7 +694,7 @@ pathname_cat(const char *pathname_a, const char *pathname_b)
bool
paths_init()
{
const char *home_dir, *xdg_config_home, *xdg_state_home;
const char *home_dir;
home_dir = getenv("HOME");
if (home_dir == NULL)
@@ -703,30 +703,30 @@ paths_init()
goto fail;
}

xdg_config_home = getenv("XDG_CONFIG_HOME");
if (xdg_config_home == NULL)
{
if (!(xdg_config_home = pathname_cat(home_dir, DEFAULT_XDG_CONFIG))) goto fail;
}
g_jackdbus_config_dir = getenv("XDG_CONFIG_HOME");
if (g_jackdbus_config_dir == NULL)
{
if (!(g_jackdbus_config_dir = pathname_cat(home_dir, DEFAULT_XDG_CONFIG))) goto fail;
}

xdg_state_home = getenv("XDG_STATE_HOME");
if (xdg_state_home == NULL)
g_jackdbus_log_dir = getenv("XDG_STATE_HOME");
if (g_jackdbus_log_dir == NULL)
{
if (!(xdg_state_home = pathname_cat(home_dir, DEFAULT_XDG_STATE))) goto fail;
if (!(g_jackdbus_log_dir = pathname_cat(home_dir, DEFAULT_XDG_STATE))) goto fail;
}

if (!(g_jackdbus_config_dir = pathname_cat(xdg_config_home, JACKDBUS_DIR))) goto fail;
if (!(g_jackdbus_log_dir = pathname_cat(xdg_state_home, JACKDBUS_DIR))) goto fail;

if (!ensure_dir_exist(xdg_config_home, 0700))
if (!ensure_dir_exist(g_jackdbus_config_dir, 0700))
{
goto fail;
}
if (!(g_jackdbus_config_dir = pathname_cat(g_jackdbus_config_dir, JACKDBUS_DIR))) goto fail;
if (!ensure_dir_exist(xdg_state_home, 0700))
if (!ensure_dir_exist(g_jackdbus_log_dir, 0700))
{
goto fail;
}
if (!(g_jackdbus_log_dir = pathname_cat(g_jackdbus_log_dir, JACKDBUS_DIR))) goto fail;

if (!ensure_dir_exist(g_jackdbus_config_dir, 0700))
{


Loading…
Cancel
Save