From 22811ebcf63d3b0c35cd6acd66aa96ba4cd843ac Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 18 Sep 2019 01:31:03 -0700
Subject: [PATCH] Remove unused macros

Most just left behind after actual code was moved into different files.
---
 src/env.cpp          | 3 ---
 src/env_dispatch.cpp | 8 --------
 src/exec.cpp         | 3 ---
 src/input.cpp        | 2 --
 src/redirection.cpp  | 3 ---
 5 files changed, 19 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index c55a20ffa..8998c4790 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -33,9 +33,6 @@
 #include "reader.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-#define DEFAULT_TERM1 "ansi"
-#define DEFAULT_TERM2 "dumb"
-
 /// Some configuration path environment variables.
 #define FISH_DATADIR_VAR L"__fish_data_dir"
 #define FISH_SYSCONFDIR_VAR L"__fish_sysconf_dir"
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 32ed7c2cb..1fec8e7c8 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -54,14 +54,6 @@
 #define DEFAULT_TERM1 "ansi"
 #define DEFAULT_TERM2 "dumb"
 
-/// 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"
-
 /// List of all locale environment variable names that might trigger (re)initializing the locale
 /// subsystem.
 static const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL", L"LC_ADDRESS",
diff --git a/src/exec.cpp b/src/exec.cpp
index 3ee725c94..48c39c7ea 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -49,9 +49,6 @@
 /// File descriptor redirection error message.
 #define FD_ERROR _(L"An error occurred while redirecting file descriptor %d")
 
-/// File descriptor redirection error message.
-#define WRITE_ERROR _(L"An error occurred while writing output")
-
 /// File redirection error message.
 #define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")
 
diff --git a/src/input.cpp b/src/input.cpp
index fe797a5cb..c1f15ae0f 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -32,8 +32,6 @@
 #include "signal.h"  // IWYU pragma: keep
 #include "wutil.h"   // IWYU pragma: keep
 
-#define MAX_INPUT_FUNCTION_ARGS 20
-
 /// A name for our own key mapping for nul.
 static const wchar_t *k_nul_mapping_name = L"nul";
 
diff --git a/src/redirection.cpp b/src/redirection.cpp
index 5a30ea740..d442aa2e8 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -5,9 +5,6 @@
 
 #include <fcntl.h>
 
-/// File descriptor redirection error message.
-#define FD_ERROR "An error occurred while redirecting file descriptor %s"
-
 #define NOCLOB_ERROR _(L"The file '%ls' already exists")
 
 #define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")