Better names

Author: Artyom Abakumov

src/jrd/trace/TraceConfigStorage.cpp

@@ -720,15 +720,15 @@ void ConfigStorage::addSession(TraceSession& session)
 	char* p = reinterpret_cast<char*> (header) + slot->offset;
 	Writer writer(p, slot->size);
 
-	writer.writeStringIfExists(tagName, session.ses_name);
+	writer.writeData(tagName, session.ses_name);
 	if (session.ses_auth.hasData())
 		writer.write(tagAuthBlock, session.ses_auth.getCount(), session.ses_auth.begin());
-	writer.writeStringIfExists(tagUserName, session.ses_user);
-	writer.writeStringIfExists(tagRole, session.ses_role);
-	writer.writeStringIfExists(tagConfig, session.ses_config);
+	writer.writeData(tagUserName, session.ses_user);
+	writer.writeData(tagRole, session.ses_role);
+	writer.writeData(tagConfig, session.ses_config);
 	writer.write(tagStartTS, sizeof(session.ses_start), &session.ses_start);
-	writer.writeStringIfExists(tagLogFile, session.ses_logfile);
-	writer.writeStringIfExists(tagPlugins, session.ses_plugins);
+	writer.writeData(tagLogFile, session.ses_logfile);
+	writer.writeData(tagPlugins, session.ses_plugins);
 
 	writer.write(tagEnd, 0, NULL);
 }

src/jrd/trace/TraceConfigStorage.h

@@ -241,7 +241,7 @@ class ConfigStorage final : public Firebird::GlobalStorage, public Firebird::Ipc
 
 		void write(ITEM tag, ULONG len, const void* data);
 
-		inline void writeStringIfExists(const ITEM tag, const Firebird::AbstractString& data)
+		inline void writeData(const ITEM tag, const Firebird::AbstractString& data)
 		{
 			if (data.empty())
 				return;

src/jrd/trace/TraceManager.cpp

@@ -327,7 +327,7 @@ void TraceManager::update_session(const TraceSession& session)
 
 	TraceInitInfoImpl attachInfo(session, attachment, filename);
 
-	for (GetPlugins<ITraceFactory> traceItr(IPluginManager::TYPE_TRACE, session.getPluginsString());
+	for (GetPlugins<ITraceFactory> traceItr(IPluginManager::TYPE_TRACE, session.getPluginsList());
 		traceItr.hasData(); traceItr.next())
 	{
 		FbLocalStatus status;

src/jrd/trace/TraceService.cpp

@@ -104,7 +104,7 @@ void TraceSvcJrd::setAttachInfo(const string& /*svc_name*/, const string& user,
 
 void TraceSvcJrd::startSession(TraceSession& session, bool interactive)
 {
-	GetPlugins<ITraceFactory> traceItr(IPluginManager::TYPE_TRACE, session.getPluginsString());
+	GetPlugins<ITraceFactory> traceItr(IPluginManager::TYPE_TRACE, session.getPluginsList());
 	if (!traceItr.hasData())
 	{
 		m_svc.printf(false, "Can not start trace session. There are no trace plugins loaded\n");

src/jrd/trace/TraceSession.h

@@ -87,7 +87,7 @@ class TraceSession
 	}
 
 	// Return string or nullptr
-	inline const char* getPluginsString() const noexcept
+	inline const char* getPluginsList() const noexcept
 	{
 		return ses_plugins.hasData() ? ses_plugins.data() : nullptr;
 	}

src/utilities/fbsvcmgr/fbsvcmgr.cpp

@@ -591,7 +591,7 @@ constexpr SvcSwitches traceStartOptions[] =
 {
 	{"trc_cfg", putFileFromArgument, 0, isc_spb_trc_cfg, 0},
 	{"trc_name", putStringArgument, 0, isc_spb_trc_name, 0},
-	{"trc_plugin", putStringArgument, 0, isc_spb_trc_plugins, 0},
+	{"trc_plugins", putStringArgument, 0, isc_spb_trc_plugins, 0},
 	{0, 0, 0, 0, 0}
 };
 

src/utilities/fbtracemgr/traceMgrMain.cpp

@@ -109,13 +109,12 @@ void TraceSvcUtil::setAttachInfo(const string& service_name, const string& user,
 	}
 }
 
-template<UCHAR Tag>
-static void insertStringIfExists(ClumpletWriter& spb, const string& str)
+static void insertString(UCHAR tag, ClumpletWriter& spb, const string& str)
 {
 	if (str.isEmpty())
 		return;
 
-	spb.insertBytes(Tag,
+	spb.insertBytes(tag,
 		reinterpret_cast<const UCHAR*> (str.c_str()),
 		str.length());
 }
@@ -169,8 +168,8 @@ void TraceSvcUtil::startSession(TraceSession& session, bool /*interactive*/)
 	spb.insertTag(isc_action_svc_trace_start);
 	spb.insertBytes(isc_spb_trc_cfg, p, len);
 
-	insertStringIfExists<isc_spb_trc_name>(spb, session.ses_name);
-	insertStringIfExists<isc_spb_trc_plugins>(spb, session.ses_plugins);
+	insertString(isc_spb_trc_name, spb, session.ses_name);
+	insertString(isc_spb_trc_plugins, spb, session.ses_plugins);
 
 	runService(spb.getBufferLength(), spb.getBuffer());
 }