h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-03 10:01:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Convert constant macros to constexpr expressions

Browse Source 
Also convert some `const[expr] static xxx` to `const[expr] xxx` where it makes
sense to let the compiler deduce on its own whether or not to allocate storage
for a constant variable rather than imposing our view that it should have STATIC
storage set aside for it.

A few call sites were not making use of the `XXX_LEN` definitions and were
calling `strlen(XXX)` - these have been updated to use `const_strlen(XXX)`
instead.

I'm not sure if any toolchains will have raise any issues with these changes...
CI will tell!
This commit is contained in:
Mahmoud Al-Qudsi
2022-09-19 17:13:47 -05:00
parent 549958a7ea
commit e1626818f7
37 changed files with 115 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/env.cpp
View File

@@ -38,19 +38,19 @@
#include "wutil.h" // IWYU pragma: keep
/// Some configuration path environment variables.
#define FISH_DATADIR_VAR L"__fish_data_dir"
#define FISH_SYSCONFDIR_VAR L"__fish_sysconf_dir"
#define FISH_HELPDIR_VAR L"__fish_help_dir"
#define FISH_BIN_DIR L"__fish_bin_dir"
#define FISH_CONFIG_DIR L"__fish_config_dir"
#define FISH_USER_DATA_DIR L"__fish_user_data_dir"
constexpr const wchar_t FISH_DATADIR_VAR[] = L"__fish_data_dir";
constexpr const wchar_t FISH_SYSCONFDIR_VAR[] = L"__fish_sysconf_dir";
constexpr const wchar_t FISH_HELPDIR_VAR[] = L"__fish_help_dir";
constexpr const wchar_t FISH_BIN_DIR[] = L"__fish_bin_dir";
constexpr const wchar_t FISH_CONFIG_DIR[] = L"__fish_config_dir";
constexpr const wchar_t FISH_USER_DATA_DIR[] = L"__fish_user_data_dir";
/// At init, we read all the environment variables from this array.
extern char **environ;
/// The character used to delimit path and non-path variables in exporting and in string expansion.
static constexpr wchar_t PATH_ARRAY_SEP = L':';
static constexpr wchar_t NONPATH_ARRAY_SEP = L' ';
constexpr wchar_t PATH_ARRAY_SEP = L':';
constexpr wchar_t NONPATH_ARRAY_SEP = L' ';
bool curses_initialized = false;