From 85168ea75e9f92bf4bb372b845622103b5294114 Mon Sep 17 00:00:00 2001
From: Vlad Khorsun <hvlad@users.sourceforge.net>
Date: Mon, 29 Apr 2024 15:23:21 +0300
Subject: [PATCH] Removed usage of deprecated items.

---
 src/alice/alice.cpp  | 4 ++--
 src/alice/aliceswi.h | 7 +------
 src/alice/exe.cpp    | 4 ----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/alice/alice.cpp b/src/alice/alice.cpp
index e8709cc250..2262f23e2c 100644
--- a/src/alice/alice.cpp
+++ b/src/alice/alice.cpp
@@ -427,7 +427,7 @@ int alice(Firebird::UtilSvc* uSvc)
 			}
 		}
 
-		if (table->in_sw_value & (sw_attach | sw_force | sw_tran /*| sw_cache*/))
+		if (table->in_sw_value & (sw_attach | sw_force | sw_tran))
 		{
 			if (--argc <= 0) {
 				ALICE_error(17);	// msg 17: number of seconds required
@@ -481,7 +481,7 @@ int alice(Firebird::UtilSvc* uSvc)
 
 	// put this here since to put it above overly complicates the parsing.
 	// can't use tbl_requires since it only looks backwards on command line.
-	if ((flags & sw_shut) && !(flags & ((sw_attach | sw_force | sw_tran /*| sw_cache*/))))
+	if ((flags & sw_shut) && !(flags & ((sw_attach | sw_force | sw_tran))))
 	{
 		ALICE_error(19);	// msg 19: must specify type of shutdown
 	}
diff --git a/src/alice/aliceswi.h b/src/alice/aliceswi.h
index e9c5f74d52..4afffe927a 100644
--- a/src/alice/aliceswi.h
+++ b/src/alice/aliceswi.h
@@ -165,11 +165,6 @@ static const Switches::in_sw_tab_t alice_in_sw_table[] =
 	{IN_SW_ALICE_COMMIT, isc_spb_rpr_commit_trans, "COMMIT", sw_commit,
 		0, ~(sw_commit | sw_auth_set | sw_nolinger), false, false, 29, 2, NULL},
 	// msg 29: \t-commit\t\tcommit transaction <tr / all>
-/*
-	{IN_SW_ALICE_CACHE, 0, "CACHE", sw_cache,
-		sw_shut, 0, false, false, 30, 2, NULL},
-	// msg 30: \t-cache\t\tshutdown cache manager
-*/
 #ifdef DEV_BUILD
 /*
 	{IN_SW_ALICE_DISABLE, 0, "DISABLE", sw_disable,
@@ -249,7 +244,7 @@ static const Switches::in_sw_tab_t alice_in_sw_table[] =
 		0, ~(sw_sweep | sw_auth_set | sw_nolinger), false, true, 45, 2, NULL},
 	// msg 45: \t-sweep\t\tforce garbage collection
 	{IN_SW_ALICE_SHUT, isc_spb_prp_shutdown_mode, "SHUTDOWN", sw_shut,
-		0, ~(sw_shut | sw_attach | /*sw_cache | */sw_force | sw_tran | sw_auth_set),
+		0, ~(sw_shut | sw_attach | sw_force | sw_tran | sw_auth_set),
 		false, false, 46, 2, NULL},
 	// msg 46: \t-shut\t\tshutdown
 	{IN_SW_ALICE_TWO_PHASE, isc_spb_rpr_recover_two_phase, "TWO_PHASE", sw_two_phase,
diff --git a/src/alice/exe.cpp b/src/alice/exe.cpp
index ba9e01f998..bd56dc06e6 100644
--- a/src/alice/exe.cpp
+++ b/src/alice/exe.cpp
@@ -256,10 +256,6 @@ static void buildDpb(Firebird::ClumpletWriter& dpb, const SINT64 switches)
 		UCHAR b = 0;
 		if (switches & sw_attach)
 			b |= isc_dpb_shut_attachment;
-/*
-		else if (switches & sw_cache)
-			b |= isc_dpb_shut_cache;
-*/
 		else if (switches & sw_force)
 			b |= isc_dpb_shut_force;
 		else if (switches & sw_tran)