Move some static variables into the only functions that use them

This commit is contained in:
Rangi42
2025-08-13 09:34:49 -04:00
parent 9c3ce69180
commit 92826a726a

View File

@@ -20,10 +20,10 @@
enum Tribool { TRI_NO, TRI_YES, TRI_MAYBE };
#if !STYLE_ANSI
static const HANDLE outHandle = GetStdHandle(STD_OUTPUT_HANDLE);
static const HANDLE errHandle = GetStdHandle(STD_ERROR_HANDLE);
static HANDLE const outHandle = GetStdHandle(STD_OUTPUT_HANDLE);
static HANDLE const errHandle = GetStdHandle(STD_ERROR_HANDLE);
static const WORD defaultAttrib = []() {
static WORD const defaultAttrib = []() {
if (CONSOLE_SCREEN_BUFFER_INFO info; GetConsoleScreenBufferInfo(outHandle, &info)
|| GetConsoleScreenBufferInfo(errHandle, &info)) {
return info.wAttributes;
@@ -36,6 +36,16 @@ static HANDLE getHandle(FILE *file) {
}
#endif // !STYLE_ANSI
static Tribool argStyle = TRI_MAYBE;
static bool isTerminal(FILE *file) {
static bool const isOutTerminal = isatty(STDOUT_FILENO);
static bool const isErrTerminal = isatty(STDERR_FILENO);
return (file == stdout && isOutTerminal) || (file == stderr && isErrTerminal);
}
static bool allowStyle(FILE *file) {
static Tribool const envStyle = []() {
if (char const *forceColor = getenv("FORCE_COLOR");
forceColor && strcmp(forceColor, "") && strcmp(forceColor, "0")) {
@@ -48,16 +58,6 @@ static Tribool const envStyle = []() {
return TRI_MAYBE;
}();
static Tribool argStyle = TRI_MAYBE;
static bool isTerminal(FILE *file) {
static bool isOutTerminal = isatty(STDOUT_FILENO);
static bool isErrTerminal = isatty(STDERR_FILENO);
return (file == stdout && isOutTerminal) || (file == stderr && isErrTerminal);
}
static bool allowStyle(FILE *file) {
if (argStyle == TRI_YES) {
return true;
} else if (argStyle == TRI_NO) {