From 87f75c737a8d7eced48c5f61e2bb6581db1f4c2a Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 10 Jul 2019 12:00:38 +0200
Subject: [PATCH] Review comments.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/list.sh        |  3 +--
 advanced/Scripts/piholeDebug.sh | 16 ++++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh
index 84acf4fc..e3dc552a 100755
--- a/advanced/Scripts/list.sh
+++ b/advanced/Scripts/list.sh
@@ -58,8 +58,7 @@ Options:
   exit 0
 }
 
-Escape
-Regexp() {
+EscapeRegexp() {
     # This way we may safely insert an arbitrary
     # string in our regular expressions
     # This sed is intentionally executed in three steps to ease maintainability
diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 965250f0..0924e984 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -1081,19 +1081,13 @@ show_adlists() {
 }
 
 show_whitelist() {
-    show_db_entries "Whitelist" "SELECT * FROM whitelist" "4 100 7 10 13 50"
+    show_db_entries "Exact whitelist" "SELECT * FROM whitelist" "4 100 7 10 13 50"
+    show_db_entries "Regex whitelist" "SELECT * FROM regex_whitelist" "4 100 7 10 13 50"
 }
 
 show_blacklist() {
-    show_db_entries "Blacklist" "SELECT * FROM blacklist" "4 100 7 10 13 50"
-}
-
-show_regexblacklist() {
-    show_db_entries "Regexblacklist" "SELECT * FROM regex_blacklist" "4 100 7 10 13 50"
-}
-
-show_regexwhitelist() {
-    show_db_entries "Regexwhitelist" "SELECT * FROM regex_whitelist" "4 100 7 10 13 50"
+    show_db_entries "Exact blacklist" "SELECT * FROM blacklist" "4 100 7 10 13 50"
+    show_db_entries "Regex blacklist" "SELECT * FROM regex_blacklist" "4 100 7 10 13 50"
 }
 
 analyze_gravity_list() {
@@ -1272,8 +1266,6 @@ analyze_gravity_list
 show_adlists
 show_whitelist
 show_blacklist
-show_regexblacklist
-show_regexwhitelist
 show_content_of_pihole_files
 parse_locale
 analyze_pihole_log