From 85fba3a316ad847409bae84826889144ef4b87de Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 3 Feb 2018 14:34:28 -0800 Subject: [PATCH] Remove HISTORY_SEARCH_TYPE_*_PCRE These were unused and unimplemented. --- src/history.cpp | 6 ------ src/history.h | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/history.cpp b/src/history.cpp index 96ce0ebdd..190208eaa 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -482,12 +482,6 @@ bool history_item_t::matches_search(const wcstring &term, enum history_search_ty if (wcpattern2.back() != ANY_STRING) wcpattern2.push_back(ANY_STRING); return wildcard_match(content_to_match, wcpattern2); } - case HISTORY_SEARCH_TYPE_CONTAINS_PCRE: { - abort(); - } - case HISTORY_SEARCH_TYPE_PREFIX_PCRE: { - abort(); - } } DIE("unexpected history_search_type_t value"); } diff --git a/src/history.h b/src/history.h index 42d1dcfb1..da4ae2e92 100644 --- a/src/history.h +++ b/src/history.h @@ -53,11 +53,7 @@ enum history_search_type_t { // Search for commands containing the given glob pattern. HISTORY_SEARCH_TYPE_CONTAINS_GLOB, // Search for commands starting with the given glob pattern. - HISTORY_SEARCH_TYPE_PREFIX_GLOB, - // Search for commands containing the given PCRE pattern. - HISTORY_SEARCH_TYPE_CONTAINS_PCRE, - // Search for commands starting with the given PCRE pattern. - HISTORY_SEARCH_TYPE_PREFIX_PCRE + HISTORY_SEARCH_TYPE_PREFIX_GLOB }; typedef uint32_t history_identifier_t;