From baf032834aa82f3e9b69f59f144c78ad5a37f5d5 Mon Sep 17 00:00:00 2001 From: ZyX Date: Thu, 29 Oct 2015 00:29:28 +0300 Subject: stdpaths: Use NULL in place of empty strings --- src/nvim/os/stdpaths.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/os/stdpaths.c') diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index ce374828f9..ab59dd9a71 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 -- cgit From 1af15494c25d1cba9e4da058fc3b958d27d3f890 Mon Sep 17 00:00:00 2001 From: ZyX Date: Thu, 29 Oct 2015 00:31:05 +0300 Subject: stdpaths: Document that stdpaths_*_subpath is not returning NULL --- src/nvim/os/stdpaths.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/os/stdpaths.c') diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index ab59dd9a71..c9631a434c 100644 --- a/src/nvim/os/stdpaths.c +++ b/src/nvim/os/stdpaths.c @@ -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) { -- cgit