diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-10-30 12:45:34 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-10-30 12:45:34 -0400 |
| commit | d1cfaa0a55412758259f65837f4ff595204acd37 (patch) | |
| tree | 864943c778dc463d36c0e168d12225a2833eeece /src/nvim/os/stdpaths.c | |
| parent | 4abf108f4639af1c35bc0554a069d878a50fcea0 (diff) | |
| parent | 10080366b8975e827b64fda49a9686117c8c8f44 (diff) | |
| download | rneovim-d1cfaa0a55412758259f65837f4ff595204acd37.tar.gz rneovim-d1cfaa0a55412758259f65837f4ff595204acd37.tar.bz2 rneovim-d1cfaa0a55412758259f65837f4ff595204acd37.zip | |
Merge pull request #3553 from ZyX-I/fix-xdg-2
Some more fixes to XDG code
Diffstat (limited to 'src/nvim/os/stdpaths.c')
| -rw-r--r-- | src/nvim/os/stdpaths.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index ce374828f9..c9631a434c 100644 --- a/src/nvim/os/stdpaths.c +++ b/src/nvim/os/stdpaths.c @@ -25,7 +25,7 @@ static const char *const xdg_defaults[] = { [kXDGConfigHome] = "$LOCALAPPDATA\\nvim\\config", [kXDGDataHome] = "$LOCALAPPDATA\\nvim\\data", [kXDGCacheHome] = "$LOCALAPPDATA\\nvim\\cache", - [kXDGRuntimeDir] = "", + [kXDGRuntimeDir] = NULL, [kXDGConfigDirs] = NULL, [kXDGDataDirs] = NULL, #else @@ -33,7 +33,7 @@ static const char *const xdg_defaults[] = { [kXDGConfigHome] = "~/.config", [kXDGDataHome] = "~/.local/share", [kXDGCacheHome] = "~/.cache", - [kXDGRuntimeDir] = "", + [kXDGRuntimeDir] = NULL, [kXDGConfigDirs] = "/etc/xdg/", [kXDGDataDirs] = "/usr/local/share/:/usr/share/", #endif @@ -82,7 +82,7 @@ static char *get_xdg_home(const XDGVarType idx) /// /// @return [allocated] `$XDG_CONFIG_HOME/nvim/{fname}` char *stdpaths_user_conf_subpath(const char *fname) - FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL + FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET { return concat_fnames_realloc(get_xdg_home(kXDGConfigHome), fname, true); } @@ -95,7 +95,7 @@ char *stdpaths_user_conf_subpath(const char *fname) /// @return [allocated] `$XDG_DATA_HOME/nvim/{fname}` char *stdpaths_user_data_subpath(const char *fname, const size_t trailing_pathseps) - FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL + FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET { char *ret = concat_fnames_realloc(get_xdg_home(kXDGDataHome), fname, true); if (trailing_pathseps) { |