Big namespace cleanup

src/alice/alice.cpp

@@ -60,6 +60,9 @@
 #include <io.h>
 #endif
 
+namespace Firebird::Alice
+{
+
 using MsgFormat::SafeArg;
 
 
@@ -90,7 +93,7 @@ constexpr int ALICE_MSG_FAC = FB_IMPL_MSG_FACILITY_GFIX;
 [[noreturn]] void ALICE_exit(int code, AliceGlobals* tdgbl)
 {
 	tdgbl->exit_code = code;
-    Firebird::LongJump::raise();
+    LongJump::raise();
 }
 
 static void alice_output(bool error, const SCHAR*, ...) ATTRIBUTE_FORMAT(2,3);
@@ -102,16 +105,16 @@ static void alice_output(bool error, const SCHAR*, ...) ATTRIBUTE_FORMAT(2,3);
 //	Entry point for GFIX in case of service manager.
 //
 
-int ALICE_main(Firebird::UtilSvc* uSvc)
+int ALICE_main(UtilSvc* uSvc)
 {
 	int exit_code = FINI_OK;
 
 	try {
 		exit_code = alice(uSvc);
 	}
-	catch (const Firebird::Exception& e)
+	catch (const Exception& e)
 	{
-		Firebird::StaticStatusVector status;
+		StaticStatusVector status;
 		e.stuffException(status);
 		uSvc->getStatusAccessor().setServiceStatus(status.begin());
 		uSvc->started();
@@ -127,7 +130,7 @@ int ALICE_main(Firebird::UtilSvc* uSvc)
 //		Parse switches and do work
 //
 
-int alice(Firebird::UtilSvc* uSvc)
+int alice(UtilSvc* uSvc)
 {
 	AliceGlobals gblInstance(uSvc);
 	AliceGlobals* tdgbl = &gblInstance;
@@ -579,16 +582,16 @@ int alice(Firebird::UtilSvc* uSvc)
 
 	}	// try
 
-	catch (const Firebird::LongJump&)
+	catch (const LongJump&)
 	{
 		// All "calls" to ALICE_exit(), normal and error exits, wind up here
 		exit_code = tdgbl->exit_code;
 	}
 
-	catch (const Firebird::Exception& e)
+	catch (const Exception& e)
 	{
 		// Non-alice exception was caught
-		Firebird::StaticStatusVector status;
+		StaticStatusVector status;
 		e.stuffException(status);
 		fb_utils::copyStatus(tdgbl->status_vector, ISC_STATUS_LENGTH, status.begin(), status.getCount());
 		ALICE_print_status(true, tdgbl->status_vector);
@@ -607,7 +610,7 @@ int alice(Firebird::UtilSvc* uSvc)
 	if ((exit_code != FINI_OK) && uSvc->isService() &&
 		(tdgbl->status[0] == 1) && (tdgbl->status[1] != 0))
 	{
-		Firebird::UtilSvc::StatusAccessor sa = uSvc->getStatusAccessor();
+		UtilSvc::StatusAccessor sa = uSvc->getStatusAccessor();
 		sa.init();
 		uSvc->getStatusAccessor().setServiceStatus(tdgbl->status);
 	}
@@ -720,7 +723,7 @@ static void alice_output(bool error, const SCHAR* format, ...)
 
 	va_list arglist;
 	va_start(arglist, format);
-	Firebird::string buf;
+	string buf;
 	buf.vprintf(format, arglist);
 	va_end(arglist);
 
@@ -729,3 +732,6 @@ static void alice_output(bool error, const SCHAR* format, ...)
 	else
 		tdgbl->uSvc->outputVerbose(buf.c_str());
 }
+
+
+} // namespace Firebird::Alice

src/alice/alice.h

@@ -33,6 +33,8 @@
 #include "../common/classes/array.h"
 #include "../common/UtilSvc.h"
 
+namespace Firebird::Alice {
+
 enum val_errors {
 	VAL_INVALID_DB_VERSION	= 0,
 
@@ -105,16 +107,16 @@ struct tdr : public pool_alloc<alice_type_tdr>
 {
 	tdr* tdr_next;						// next sub-transaction
 	TraNumber tdr_id;					// database-specific transaction id
-	Firebird::string tdr_fullpath;		// full (possibly) remote pathname
-	Firebird::string tdr_filename;		// filename
-	Firebird::string tdr_host_site;		// host for transaction
-	Firebird::string tdr_remote_site;	// site for remote transaction
+	string tdr_fullpath;		// full (possibly) remote pathname
+	string tdr_filename;		// filename
+	string tdr_host_site;		// host for transaction
+	string tdr_remote_site;	// site for remote transaction
 	FB_API_HANDLE tdr_handle;			// reconnected transaction handle
 	FB_API_HANDLE tdr_db_handle;		// re-attached database handle
 	USHORT tdr_db_caps;					// capabilities of database
 	USHORT tdr_state;					// see flags below
 
-	tdr(Firebird::MemoryPool& p)
+	tdr(MemoryPool& p)
 		: tdr_fullpath(p), tdr_filename(p), tdr_host_site(p), tdr_remote_site(p)
 	{ }
 };
@@ -149,19 +151,19 @@ enum tdr_state_vals {
 
 // Global data
 
-class AliceGlobals : public Firebird::ThreadData
+class AliceGlobals : public ThreadData
 {
 private:
 	MemoryPool* ALICE_default_pool;
-	friend class Firebird::SubsystemContextPoolHolder <AliceGlobals, MemoryPool>;
+	friend class SubsystemContextPoolHolder <AliceGlobals, MemoryPool>;
 
 	void setDefaultPool(MemoryPool* p)
 	{
 		ALICE_default_pool = p;
 	}
 
 public:
-	AliceGlobals(Firebird::UtilSvc* us)
+	AliceGlobals(UtilSvc* us)
 		: ThreadData(ThreadData::tddALICE),
 		ALICE_default_pool(0),
 		exit_code(FINI_ERROR),	// prevent FINI_OK in case of unknown error thrown
@@ -184,7 +186,7 @@ class AliceGlobals : public Firebird::ThreadData
 	user_action		ALICE_data;
 	ISC_STATUS_ARRAY	status_vector;
 	int				exit_code;
-	Firebird::UtilSvc*	uSvc;
+	UtilSvc*	uSvc;
 	FILE*		output_file;
 	isc_db_handle	db_handle;
 	isc_tr_handle	tr_handle;
@@ -206,7 +208,8 @@ class AliceGlobals : public Firebird::ThreadData
 	}
 };
 
-typedef Firebird::SubsystemContextPoolHolder <AliceGlobals, MemoryPool> AliceContextPoolHolder;
+typedef SubsystemContextPoolHolder <AliceGlobals, MemoryPool> AliceContextPoolHolder;
 
-#endif	// ALICE_ALICE_H
+} // namespace Firebird::Alice
 
+#endif	// ALICE_ALICE_H

src/alice/alice_meta.epp

@@ -53,9 +53,11 @@ DATABASE DB = STATIC FILENAME "yachts.lnk";
 #define DB			tdgbl->db_handle
 #define gds_trans	tdgbl->tr_handle
 
-typedef Firebird::HalfStaticArray<TEXT, 1024> TextBuffer;
+namespace Firebird::Alice {
 
-static void get_string(const TEXT**, Firebird::string&);
+typedef HalfStaticArray<TEXT, 1024> TextBuffer;
+
+static void get_string(const TEXT**, string&);
 static USHORT get_capabilities(ISC_STATUS*);
 static tdr* get_description(ISC_QUAD*);
 static void parse_fullpath(tdr*);
@@ -81,7 +83,7 @@ static const rfr_tab_t rfr_table[] =
 static inline void return_error(const ISC_STATUS* /*user_status*/)
 {
 	ALICE_print_status(true, gds_status);
-	Firebird::LongJump::raise();
+	LongJump::raise();
 }
 
 /*____________________________________________________________
@@ -243,7 +245,7 @@ void MET_set_capabilities(ISC_STATUS* user_status, tdr* trans)
  *		Eat a string with a byte-encoded length.
  */
 
-static void get_string(const TEXT** ptr, Firebird::string& str)
+static void get_string(const TEXT** ptr, string& str)
 {
 	AliceGlobals* tdgbl = AliceGlobals::getSpecific();
 
@@ -316,11 +318,11 @@ static tdr* get_description(ISC_QUAD* blob_id)
 		return NULL;
 
 	tdr* trans = NULL;
-	Firebird::string host_site;
-	Firebird::string database_path;
+	string host_site;
+	string database_path;
 
 	const TEXT* p = buffer.begin();
-	Firebird::MemoryPool& pool(*tdgbl->getDefaultPool());
+	MemoryPool& pool(*tdgbl->getDefaultPool());
 
 	// skip version number
 	++p;
@@ -380,8 +382,8 @@ static tdr* get_description(ISC_QUAD* blob_id)
 
 static void parse_fullpath(tdr* trans)
 {
-	Firebird::PathName filename = trans->tdr_fullpath.c_str();
-	Firebird::PathName hostname;
+	PathName filename = trans->tdr_fullpath.c_str();
+	PathName hostname;
 
 	// Find the last remote node in the path
 
@@ -442,3 +444,5 @@ static bool snarf_blob(ISC_QUAD* blob_id, TextBuffer& buffer)
 
 	return true;
 }
+
+} // namespace Firebird::Alice

src/alice/alice_meta.h

@@ -24,10 +24,13 @@
 #ifndef ALICE_ALICE_META_H
 #define ALICE_ALICE_META_H
 
+namespace Firebird::Alice {
+
 void	MET_disable_wal(ISC_STATUS*, isc_db_handle);
 void	MET_get_state(ISC_STATUS*, tdr*);
 tdr*	MET_get_transaction(ISC_STATUS*, isc_db_handle, TraNumber);
 void	MET_set_capabilities(ISC_STATUS*, tdr*);
 
-#endif	// ALICE_ALICE_META_H
+} // namespace Firebird::Alice
 
+#endif	// ALICE_ALICE_META_H

src/alice/alice_proto.h

@@ -28,8 +28,12 @@
 #include "../common/classes/MsgPrint.h"
 #include "../common/UtilSvc.h"
 
-int		ALICE_main(Firebird::UtilSvc*);
-int		alice(Firebird::UtilSvc*);
+namespace Firebird::Alice
+{
+
+
+int		ALICE_main(UtilSvc*);
+int		alice(UtilSvc*);
 
 class AliceGlobals;
 
@@ -39,4 +43,7 @@ void	ALICE_print(USHORT, const MsgFormat::SafeArg& arg = MsgFormat::SafeArg());
 void	ALICE_print_status(bool error, const ISC_STATUS*);
 [[noreturn]] void ALICE_exit(int, AliceGlobals*);
 
+
+} // namespace Firebird::Alice
+
 #endif // ALICE_ALICE_PROTO_H

src/alice/aliceswi.h

@@ -23,7 +23,11 @@
 #define	ALICE_ALICESWI_H
 
 #include "ibase.h"
-#include "../jrd/constants.h"
+#include "../common/constants.h"
+
+namespace Firebird::Alice
+{
+
 
 // switch definitions
 
@@ -331,4 +335,7 @@ static inline constexpr const char* alice_repl_mode_sw_table[] =
 	ALICE_SW_MODE_NONE, ALICE_SW_MODE_RO, ALICE_SW_MODE_RW
 };
 
+
+} // namespace Firebird::Alice
+
 #endif // ALICE_ALICESWI_H

src/alice/exe.cpp

@@ -44,11 +44,14 @@
 #include "../alice/alice_meta.h"
 #include "../alice/tdr_proto.h"
 #include "../yvalve/gds_proto.h"
-#include "../jrd/constants.h"
+#include "../common/constants.h"
 #include "../common/classes/ClumpletWriter.h"
 
+namespace Firebird::Alice
+{
+
 
-static void buildDpb(Firebird::ClumpletWriter&, const SINT64);
+static void buildDpb(ClumpletWriter&, const SINT64);
 static void extract_db_info(const UCHAR*, size_t);
 
 // Keep always in sync with function extract_db_info()
@@ -73,7 +76,7 @@ int EXE_action(const TEXT* database, const SINT64 switches)
 	bool error = false;
 	AliceGlobals* tdgbl = AliceGlobals::getSpecific();
 	{
-		Firebird::AutoMemoryPool newPool(MemoryPool::createPool());
+		AutoMemoryPool newPool(MemoryPool::createPool());
 		AliceContextPoolHolder context(tdgbl, newPool);
 
 		for (USHORT i = 0; i < MAX_VAL_ERRORS; i++)
@@ -83,7 +86,7 @@ int EXE_action(const TEXT* database, const SINT64 switches)
 
 		// generate the database parameter block for the attach,
 		// based on the various switches
-		Firebird::ClumpletWriter dpb(Firebird::ClumpletReader::Tagged, MAX_DPB_SIZE);
+		ClumpletWriter dpb(ClumpletReader::Tagged, MAX_DPB_SIZE);
 		buildDpb(dpb, switches);
 
 		FB_API_HANDLE handle = 0;
@@ -110,8 +113,8 @@ int EXE_action(const TEXT* database, const SINT64 switches)
 			if ((switches & sw_validate) && (tdgbl->status[1] != isc_bug_check))
 			{
 				isc_database_info(tdgbl->status, &handle, sizeof(val_errors),
-							   val_errors, sizeof(error_string),
-							   reinterpret_cast<char*>(error_string));
+						   val_errors, sizeof(error_string),
+						   reinterpret_cast<char*>(error_string));
 
 				extract_db_info(error_string, sizeof(error_string));
 			}
@@ -145,7 +148,7 @@ int EXE_two_phase(const TEXT* database, const SINT64 switches)
 	bool error = false;
 	AliceGlobals* tdgbl = AliceGlobals::getSpecific();
 	{
-		Firebird::AutoMemoryPool newPool(MemoryPool::createPool());
+		AutoMemoryPool newPool(MemoryPool::createPool());
 		AliceContextPoolHolder context(tdgbl, newPool);
 
 		for (USHORT i = 0; i < MAX_VAL_ERRORS; i++)
@@ -155,7 +158,7 @@ int EXE_two_phase(const TEXT* database, const SINT64 switches)
 
 		// generate the database parameter block for the attach,
 		// based on the various switches
-		Firebird::ClumpletWriter dpb(Firebird::ClumpletReader::Tagged, MAX_DPB_SIZE);
+		ClumpletWriter dpb(ClumpletReader::Tagged, MAX_DPB_SIZE);
 		buildDpb(dpb, switches);
 
 		FB_API_HANDLE handle = 0;
@@ -198,7 +201,7 @@ int EXE_two_phase(const TEXT* database, const SINT64 switches)
 //  based on the various switches
 //
 
-static void buildDpb(Firebird::ClumpletWriter& dpb, const SINT64 switches)
+static void buildDpb(ClumpletWriter& dpb, const SINT64 switches)
 {
 	AliceGlobals* tdgbl = AliceGlobals::getSpecific();
 	dpb.reset(isc_dpb_version1);
@@ -483,3 +486,6 @@ static void extract_db_info(const UCHAR* db_info_buffer, size_t buf_size)
 		p += length;
 	}
 }
+
+
+} // namespace Firebird::Alice

src/alice/exe_proto.h

@@ -24,7 +24,11 @@
 #ifndef ALICE_EXE_PROTO_H
 #define ALICE_EXE_PROTO_H
 
+namespace Firebird::Alice {
+
 int EXE_action(const TEXT*, const SINT64);
 int EXE_two_phase(const TEXT*, const SINT64);
 
+} // namespace Firebird::Alice
+
 #endif // ALICE_EXE_PROTO_H