Replace internal 'dsc' with public 'paramdsc' in the API. So far they're binary compatible and this breaks nothing. But it prevents problems when 'dsc' is to be extended. (#8489)

dyemanov · web-flow · commit ed26e8a16314 · 2025-06-16T11:34:15.000+03:00
diff --git a/src/common/dsc.h b/src/common/dsc.h
@@ -512,7 +512,19 @@ typedef struct dsc
 		d.dsc_length = dsc_length;
 		d.dsc_sub_type = dsc_sub_type;
 		d.dsc_flags = dsc_flags;
-		d.dsc_offset = (ULONG)(IPTR)dsc_address;
+		d.dsc_offset = (ULONG)(IPTR) dsc_address;
+		return d;
+	}
+
+	operator paramdsc() const
+	{
+		paramdsc d;
+		d.dsc_dtype = dsc_dtype;
+		d.dsc_scale = dsc_scale;
+		d.dsc_length = dsc_length;
+		d.dsc_sub_type = dsc_sub_type;
+		d.dsc_flags = dsc_flags;
+		d.dsc_address = dsc_address;
 		return d;
 	}
 
diff --git a/src/include/firebird/FirebirdInterface.idl b/src/include/firebird/FirebirdInterface.idl
@@ -1318,7 +1318,7 @@ interface XpbBuilder : Disposable
 // Database trace objects
 
 struct PerformanceInfo;
-struct dsc;
+struct paramdsc;
 
 interface TraceConnection : Versioned
 {
@@ -1365,7 +1365,7 @@ version: // 3.0.4 -> 3.0.5
 interface TraceParams : Versioned
 {
 	uint getCount();
-	const dsc* getParam(uint idx);
+	const paramdsc* getParam(uint idx);
 
 version:
 	const string getTextUTF8(Status status, uint idx);
diff --git a/src/include/firebird/IdlFbInterfaces.h b/src/include/firebird/IdlFbInterfaces.h
@@ -5536,7 +5536,7 @@ namespace Firebird
 		struct VTable : public IVersioned::VTable
 		{
 			unsigned (CLOOP_CARG *getCount)(ITraceParams* self) CLOOP_NOEXCEPT;
-			const dsc* (CLOOP_CARG *getParam)(ITraceParams* self, unsigned idx) CLOOP_NOEXCEPT;
+			const paramdsc* (CLOOP_CARG *getParam)(ITraceParams* self, unsigned idx) CLOOP_NOEXCEPT;
 			const char* (CLOOP_CARG *getTextUTF8)(ITraceParams* self, IStatus* status, unsigned idx) CLOOP_NOEXCEPT;
 		};
 
@@ -5559,9 +5559,9 @@ namespace Firebird
 			return ret;
 		}
 
-		const dsc* getParam(unsigned idx)
+		const paramdsc* getParam(unsigned idx)
 		{
-			const dsc* ret = static_cast<VTable*>(this->cloopVTable)->getParam(this, idx);
+			const paramdsc* ret = static_cast<VTable*>(this->cloopVTable)->getParam(this, idx);
 			return ret;
 		}
 
@@ -17760,7 +17760,7 @@ namespace Firebird
 			}
 		}
 
-		static const dsc* CLOOP_CARG cloopgetParamDispatcher(ITraceParams* self, unsigned idx) CLOOP_NOEXCEPT
+		static const paramdsc* CLOOP_CARG cloopgetParamDispatcher(ITraceParams* self, unsigned idx) CLOOP_NOEXCEPT
 		{
 			try
 			{
@@ -17769,7 +17769,7 @@ namespace Firebird
 			catch (...)
 			{
 				StatusType::catchException(0);
-				return static_cast<const dsc*>(0);
+				return static_cast<const paramdsc*>(0);
 			}
 		}
 
@@ -17803,7 +17803,7 @@ namespace Firebird
 		}
 
 		virtual unsigned getCount() = 0;
-		virtual const dsc* getParam(unsigned idx) = 0;
+		virtual const paramdsc* getParam(unsigned idx) = 0;
 		virtual const char* getTextUTF8(StatusType* status, unsigned idx) = 0;
 	};
 
diff --git a/src/include/gen/Firebird.pas b/src/include/gen/Firebird.pas
@@ -207,7 +207,7 @@ 	ISC_TIMESTAMP_TZ_EX = record
 	IntegerPtr = ^Integer;
 	NativeIntPtr = ^NativeInt;
 	PerformanceInfoPtr = ^PerformanceInfo;
-	dscPtr = ^dsc;
+	paramdscPtr = ^paramdsc;
 
 	IReferenceCounted_addRefPtr = procedure(this: IReferenceCounted); cdecl;
 	IReferenceCounted_releasePtr = function(this: IReferenceCounted): Integer; cdecl;
@@ -611,7 +611,7 @@ 	ISC_TIMESTAMP_TZ_EX = record
 	ITraceTransaction_getInitialIDPtr = function(this: ITraceTransaction): Int64; cdecl;
 	ITraceTransaction_getPreviousIDPtr = function(this: ITraceTransaction): Int64; cdecl;
 	ITraceParams_getCountPtr = function(this: ITraceParams): Cardinal; cdecl;
-	ITraceParams_getParamPtr = function(this: ITraceParams; idx: Cardinal): dscPtr; cdecl;
+	ITraceParams_getParamPtr = function(this: ITraceParams; idx: Cardinal): paramdscPtr; cdecl;
 	ITraceParams_getTextUTF8Ptr = function(this: ITraceParams; status: IStatus; idx: Cardinal): PAnsiChar; cdecl;
 	ITraceStatement_getStmtIDPtr = function(this: ITraceStatement): Int64; cdecl;
 	ITraceStatement_getPerfPtr = function(this: ITraceStatement): PerformanceInfoPtr; cdecl;
@@ -3089,15 +3089,15 @@ 	ITraceParams = class(IVersioned)
 		const VERSION = 3;
 
 		function getCount(): Cardinal;
-		function getParam(idx: Cardinal): dscPtr;
+		function getParam(idx: Cardinal): paramdscPtr;
 		function getTextUTF8(status: IStatus; idx: Cardinal): PAnsiChar;
 	end;
 
 	ITraceParamsImpl = class(ITraceParams)
 		constructor create;
 
 		function getCount(): Cardinal; virtual; abstract;
-		function getParam(idx: Cardinal): dscPtr; virtual; abstract;
+		function getParam(idx: Cardinal): paramdscPtr; virtual; abstract;
 		function getTextUTF8(status: IStatus; idx: Cardinal): PAnsiChar; virtual; abstract;
 	end;
 
@@ -9084,7 +9084,7 @@ function ITraceParams.getCount(): Cardinal;
 	Result := TraceParamsVTable(vTable).getCount(Self);
 end;
 
-function ITraceParams.getParam(idx: Cardinal): dscPtr;
+function ITraceParams.getParam(idx: Cardinal): paramdscPtr;
 begin
 	Result := TraceParamsVTable(vTable).getParam(Self, idx);
 end;
@@ -15416,7 +15416,7 @@ function ITraceParamsImpl_getCountDispatcher(this: ITraceParams): Cardinal; cdec
 	end
 end;
 
-function ITraceParamsImpl_getParamDispatcher(this: ITraceParams; idx: Cardinal): dscPtr; cdecl;
+function ITraceParamsImpl_getParamDispatcher(this: ITraceParams; idx: Cardinal): paramdscPtr; cdecl;
 begin
 	Result := nil;
 	try
diff --git a/src/jrd/trace/TraceObjects.cpp b/src/jrd/trace/TraceObjects.cpp
@@ -61,7 +61,7 @@ namespace
 
 // Convert text descriptor into UTF8 string.
 // Binary data converted into HEX representation.
-bool descToUTF8(const dsc* param, string& result)
+bool descToUTF8(const paramdsc* param, string& result)
 {
 	UCHAR* address;
 	USHORT length;
@@ -83,7 +83,7 @@ bool descToUTF8(const dsc* param, string& result)
 		return false;
 	}
 
-	if (param->getCharSet() == CS_BINARY)
+	if (param->dsc_sub_type == CS_BINARY)
 	{
 		// Convert OCTETS and [VAR]BINARY to HEX string
 
@@ -312,15 +312,19 @@ void TraceSQLStatementImpl::DSQLParamsImpl::fillParams()
 			if (idx >= m_descs.getCount())
 				m_descs.getBuffer(idx + 1);
 
-			dsc& desc = m_descs[idx];
+			auto& desc = m_descs[idx];
 
 			desc = fmt->fmt_desc[parameter->par_parameter];
+
 			// Use descriptor for nulls signaling
-			if (parameter->par_null)
+			if (const auto nullParam = parameter->par_null)
 			{
-				if (*(SSHORT*) (m_buffer + (IPTR) fmt->fmt_desc[parameter->par_null->par_parameter].dsc_address))
+				const auto& nullDesc = fmt->fmt_desc[nullParam->par_parameter];
+
+				if (*(SSHORT*) (m_buffer + (IPTR) nullDesc.dsc_address))
 					desc.dsc_flags |= DSC_null;
 			}
+
 			// Even if plugin try to change data in buffer (which is pointless)
 			// most likely it is safe because client buffer is writeble though
 			// in EXE_send() it is declared as const.
@@ -336,19 +340,19 @@ FB_SIZE_T TraceSQLStatementImpl::DSQLParamsImpl::getCount()
 	return m_descs.getCount();
 }
 
-const dsc* TraceSQLStatementImpl::DSQLParamsImpl::getParam(FB_SIZE_T idx)
+const paramdsc* TraceSQLStatementImpl::DSQLParamsImpl::getParam(FB_SIZE_T idx)
 {
 	fillParams();
 
-	if (idx >= 0 && idx < m_descs.getCount())
+	if (idx < m_descs.getCount())
 		return &m_descs[idx];
 
 	return NULL;
 }
 
 const char* TraceSQLStatementImpl::DSQLParamsImpl::getTextUTF8(CheckStatusWrapper* status, FB_SIZE_T idx)
 {
-	const dsc* param = getParam(idx);
+	const paramdsc* const param = getParam(idx);
 
 	if (descToUTF8(param, m_tempUTF8))
 		return m_tempUTF8.c_str();
@@ -378,14 +382,14 @@ FB_SIZE_T TraceParamsImpl::getCount()
 	return m_descs->getCount();
 }
 
-const dsc* TraceParamsImpl::getParam(FB_SIZE_T idx)
+const paramdsc* TraceParamsImpl::getParam(FB_SIZE_T idx)
 {
 	return m_descs->getParam(idx);
 }
 
 const char* TraceParamsImpl::getTextUTF8(CheckStatusWrapper* status, FB_SIZE_T idx)
 {
-	const dsc* param = getParam(idx);
+	const paramdsc* const param = getParam(idx);
 
 	if (descToUTF8(param, m_tempUTF8))
 		return m_tempUTF8.c_str();
@@ -465,7 +469,7 @@ void TraceDscFromMsg::fillParams()
 	const dsc* fmtDesc = m_format->fmt_desc.begin();
 	const dsc* const fmtEnd = m_format->fmt_desc.end();
 
-	dsc* desc = m_descs.getBuffer(m_format->fmt_count / 2);
+	paramdsc* desc = m_descs.getBuffer(m_format->fmt_count / 2);
 
 	for (; fmtDesc < fmtEnd; fmtDesc += 2, desc++)
 	{
@@ -477,7 +481,7 @@ void TraceDscFromMsg::fillParams()
 		const ULONG nullOffset = (IPTR) fmtDesc[1].dsc_address;
 		const SSHORT* const nullPtr = (const SSHORT*) (m_inMsg + nullOffset);
 		if (*nullPtr == -1)
-			desc->setNull();
+			desc->dsc_flags |= DSC_null;
 	}
 }
 
diff --git a/src/jrd/trace/TraceObjects.h b/src/jrd/trace/TraceObjects.h
@@ -256,15 +256,15 @@ class TraceSQLStatementImpl :
 		}
 
 		FB_SIZE_T getCount();
-		const dsc* getParam(FB_SIZE_T idx);
+		const paramdsc* getParam(FB_SIZE_T idx);
 		const char* getTextUTF8(Firebird::CheckStatusWrapper* status, FB_SIZE_T idx);
 
 	private:
 		void fillParams();
 
 		DsqlRequest* const m_stmt;
 		const UCHAR* m_buffer;
-		Firebird::HalfStaticArray<dsc, 16> m_descs;
+		Firebird::HalfStaticArray<paramdsc, 16> m_descs;
 		Firebird::string m_tempUTF8;
 	};
 
@@ -333,7 +333,7 @@ class TraceParamsImpl :
 
 	// TraceParams implementation
 	FB_SIZE_T getCount();
-	const dsc* getParam(FB_SIZE_T idx);
+	const paramdsc* getParam(FB_SIZE_T idx);
 	const char* getTextUTF8(Firebird::CheckStatusWrapper* status, FB_SIZE_T idx);
 
 private:
@@ -356,11 +356,11 @@ class TraceDescriptors
 		return m_descs.getCount();
 	}
 
-	const dsc* getParam(FB_SIZE_T idx)
+	const paramdsc* getParam(FB_SIZE_T idx)
 	{
 		fillParams();
 
-		if (/*idx >= 0 &&*/ idx < m_descs.getCount())
+		if (idx < m_descs.getCount())
 			return &m_descs[idx];
 
 		return NULL;
@@ -374,7 +374,7 @@ class TraceDescriptors
 protected:
 	virtual void fillParams() = 0;
 
-	Firebird::HalfStaticArray<dsc, 16> m_descs;
+	Firebird::HalfStaticArray<paramdsc, 16> m_descs;
 
 private:
 	TraceParamsImpl	m_traceParams;
@@ -427,7 +427,7 @@ class TraceDscFromDsc : public TraceDescriptors
 		else
 		{
 			m_descs.grow(1);
-			m_descs[0].setNull();
+			m_descs[0].dsc_flags |= DSC_null;
 		}
 	}
 
diff --git a/src/utilities/ntrace/TracePluginImpl.cpp b/src/utilities/ntrace/TracePluginImpl.cpp
@@ -815,7 +815,7 @@ void TracePluginImpl::appendParams(ITraceParams* params)
 
 	for (FB_SIZE_T i = 0; i < paramcount; i++)
 	{
-		const struct dsc* parameters = params->getParam(i);
+		const paramdsc* const parameters = params->getParam(i);
 
 		// See if we need to print any more arguments
 		if (config.max_arg_count && i >= config.max_arg_count)
@@ -829,7 +829,7 @@ void TracePluginImpl::appendParams(ITraceParams* params)
 		switch (parameters->dsc_dtype)
 		{
 			case dtype_text:
-				if (parameters->getTextType() == fb_text_subtype_binary)
+				if (parameters->dsc_sub_type == fb_text_subtype_binary)
 					paramtype.printf("binary(%d)", parameters->dsc_length);
 				else
 					paramtype.printf("char(%d)", parameters->dsc_length);
@@ -838,7 +838,7 @@ void TracePluginImpl::appendParams(ITraceParams* params)
 				paramtype.printf("cstring(%d)", parameters->dsc_length - 1);
 				break;
 			case dtype_varying:
-				if (parameters->getTextType() == fb_text_subtype_binary)
+				if (parameters->dsc_sub_type == fb_text_subtype_binary)
 					paramtype.printf("varbinary(%d)", parameters->dsc_length - 2);
 				else
 					paramtype.printf("varchar(%d)", parameters->dsc_length - 2);

Original file line number	Diff line number	Diff line change
`@@ -1318,7 +1318,7 @@ interface XpbBuilder : Disposable`
`1318`	`1318`	`// Database trace objects`
`1319`	`1319`
`1320`	`1320`	`struct PerformanceInfo;`
`1321`		`-struct dsc;`
	`1321`	`+struct paramdsc;`
`1322`	`1322`
`1323`	`1323`	`interface TraceConnection : Versioned`
`1324`	`1324`	`{`
`@@ -1365,7 +1365,7 @@ version: // 3.0.4 -> 3.0.5`
`1365`	`1365`	`interface TraceParams : Versioned`
`1366`	`1366`	`{`
`1367`	`1367`	`uint getCount();`
`1368`		`- const dsc* getParam(uint idx);`
	`1368`	`+ const paramdsc* getParam(uint idx);`
`1369`	`1369`
`1370`	`1370`	`version:`
`1371`	`1371`	`const string getTextUTF8(Status status, uint idx);`
Original file line number	Diff line number	Diff line change
`@@ -5536,7 +5536,7 @@ namespace Firebird`
`5536`	`5536`	`struct VTable : public IVersioned::VTable`
`5537`	`5537`	`{`
`5538`	`5538`	`unsigned (CLOOP_CARG getCount)(ITraceParams self) CLOOP_NOEXCEPT;`
`5539`		`- const dsc* (CLOOP_CARG getParam)(ITraceParams self, unsigned idx) CLOOP_NOEXCEPT;`
	`5539`	`+ const paramdsc* (CLOOP_CARG getParam)(ITraceParams self, unsigned idx) CLOOP_NOEXCEPT;`
`5540`	`5540`	`const char* (CLOOP_CARG getTextUTF8)(ITraceParams self, IStatus* status, unsigned idx) CLOOP_NOEXCEPT;`
`5541`	`5541`	`};`
`5542`	`5542`
`@@ -5559,9 +5559,9 @@ namespace Firebird`
`5559`	`5559`	`return ret;`
`5560`	`5560`	`}`
`5561`	`5561`
`5562`		`- const dsc* getParam(unsigned idx)`
	`5562`	`+ const paramdsc* getParam(unsigned idx)`
`5563`	`5563`	`{`
`5564`		`- const dsc* ret = static_cast<VTable*>(this->cloopVTable)->getParam(this, idx);`
	`5564`	`+ const paramdsc* ret = static_cast<VTable*>(this->cloopVTable)->getParam(this, idx);`
`5565`	`5565`	`return ret;`
`5566`	`5566`	`}`
`5567`	`5567`
`@@ -17760,7 +17760,7 @@ namespace Firebird`
`17760`	`17760`	`}`
`17761`	`17761`	`}`
`17762`	`17762`
`17763`		`- static const dsc* CLOOP_CARG cloopgetParamDispatcher(ITraceParams* self, unsigned idx) CLOOP_NOEXCEPT`
	`17763`	`+ static const paramdsc* CLOOP_CARG cloopgetParamDispatcher(ITraceParams* self, unsigned idx) CLOOP_NOEXCEPT`
`17764`	`17764`	`{`
`17765`	`17765`	`try`
`17766`	`17766`	`{`
`@@ -17769,7 +17769,7 @@ namespace Firebird`
`17769`	`17769`	`catch (...)`
`17770`	`17770`	`{`
`17771`	`17771`	`StatusType::catchException(0);`
`17772`		`- return static_cast<const dsc*>(0);`
	`17772`	`+ return static_cast<const paramdsc*>(0);`
`17773`	`17773`	`}`
`17774`	`17774`	`}`
`17775`	`17775`
`@@ -17803,7 +17803,7 @@ namespace Firebird`
`17803`	`17803`	`}`
`17804`	`17804`
`17805`	`17805`	`virtual unsigned getCount() = 0;`
`17806`		`- virtual const dsc* getParam(unsigned idx) = 0;`
	`17806`	`+ virtual const paramdsc* getParam(unsigned idx) = 0;`
`17807`	`17807`	`virtual const char* getTextUTF8(StatusType* status, unsigned idx) = 0;`
`17808`	`17808`	`};`
`17809`	`17809`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ namespace`
`61`	`61`
`62`	`62`	`// Convert text descriptor into UTF8 string.`
`63`	`63`	`// Binary data converted into HEX representation.`
`64`		`-bool descToUTF8(const dsc* param, string& result)`
	`64`	`+bool descToUTF8(const paramdsc* param, string& result)`
`65`	`65`	`{`
`66`	`66`	`UCHAR* address;`
`67`	`67`	`USHORT length;`
`@@ -83,7 +83,7 @@ bool descToUTF8(const dsc* param, string& result)`
`83`	`83`	`return false;`
`84`	`84`	`}`
`85`	`85`
`86`		`- if (param->getCharSet() == CS_BINARY)`
	`86`	`+ if (param->dsc_sub_type == CS_BINARY)`
`87`	`87`	`{`
`88`	`88`	`// Convert OCTETS and [VAR]BINARY to HEX string`
`89`	`89`
`@@ -312,15 +312,19 @@ void TraceSQLStatementImpl::DSQLParamsImpl::fillParams()`
`312`	`312`	`if (idx >= m_descs.getCount())`
`313`	`313`	`m_descs.getBuffer(idx + 1);`
`314`	`314`
`315`		`- dsc& desc = m_descs[idx];`
	`315`	`+ auto& desc = m_descs[idx];`
`316`	`316`
`317`	`317`	`desc = fmt->fmt_desc[parameter->par_parameter];`
	`318`	`+`
`318`	`319`	`// Use descriptor for nulls signaling`
`319`		`- if (parameter->par_null)`
	`320`	`+ if (const auto nullParam = parameter->par_null)`
`320`	`321`	`{`
`321`		`- if ((SSHORT) (m_buffer + (IPTR) fmt->fmt_desc[parameter->par_null->par_parameter].dsc_address))`
	`322`	`+ const auto& nullDesc = fmt->fmt_desc[nullParam->par_parameter];`
	`323`	`+`
	`324`	`+ if ((SSHORT) (m_buffer + (IPTR) nullDesc.dsc_address))`
`322`	`325`	`desc.dsc_flags \|= DSC_null;`
`323`	`326`	`}`
	`327`	`+`
`324`	`328`	`// Even if plugin try to change data in buffer (which is pointless)`
`325`	`329`	`// most likely it is safe because client buffer is writeble though`
`326`	`330`	`// in EXE_send() it is declared as const.`
`@@ -336,19 +340,19 @@ FB_SIZE_T TraceSQLStatementImpl::DSQLParamsImpl::getCount()`
`336`	`340`	`return m_descs.getCount();`
`337`	`341`	`}`
`338`	`342`
`339`		`-const dsc* TraceSQLStatementImpl::DSQLParamsImpl::getParam(FB_SIZE_T idx)`
	`343`	`+const paramdsc* TraceSQLStatementImpl::DSQLParamsImpl::getParam(FB_SIZE_T idx)`
`340`	`344`	`{`
`341`	`345`	`fillParams();`
`342`	`346`
`343`		`- if (idx >= 0 && idx < m_descs.getCount())`
	`347`	`+ if (idx < m_descs.getCount())`
`344`	`348`	`return &m_descs[idx];`
`345`	`349`
`346`	`350`	`return NULL;`
`347`	`351`	`}`
`348`	`352`
`349`	`353`	`const char* TraceSQLStatementImpl::DSQLParamsImpl::getTextUTF8(CheckStatusWrapper* status, FB_SIZE_T idx)`
`350`	`354`	`{`
`351`		`- const dsc* param = getParam(idx);`
	`355`	`+ const paramdsc* const param = getParam(idx);`
`352`	`356`
`353`	`357`	`if (descToUTF8(param, m_tempUTF8))`
`354`	`358`	`return m_tempUTF8.c_str();`
`@@ -378,14 +382,14 @@ FB_SIZE_T TraceParamsImpl::getCount()`
`378`	`382`	`return m_descs->getCount();`
`379`	`383`	`}`
`380`	`384`
`381`		`-const dsc* TraceParamsImpl::getParam(FB_SIZE_T idx)`
	`385`	`+const paramdsc* TraceParamsImpl::getParam(FB_SIZE_T idx)`
`382`	`386`	`{`
`383`	`387`	`return m_descs->getParam(idx);`
`384`	`388`	`}`
`385`	`389`
`386`	`390`	`const char* TraceParamsImpl::getTextUTF8(CheckStatusWrapper* status, FB_SIZE_T idx)`
`387`	`391`	`{`
`388`		`- const dsc* param = getParam(idx);`
	`392`	`+ const paramdsc* const param = getParam(idx);`
`389`	`393`
`390`	`394`	`if (descToUTF8(param, m_tempUTF8))`
`391`	`395`	`return m_tempUTF8.c_str();`
`@@ -465,7 +469,7 @@ void TraceDscFromMsg::fillParams()`
`465`	`469`	`const dsc* fmtDesc = m_format->fmt_desc.begin();`
`466`	`470`	`const dsc* const fmtEnd = m_format->fmt_desc.end();`
`467`	`471`
`468`		`- dsc* desc = m_descs.getBuffer(m_format->fmt_count / 2);`
	`472`	`+ paramdsc* desc = m_descs.getBuffer(m_format->fmt_count / 2);`
`469`	`473`
`470`	`474`	`for (; fmtDesc < fmtEnd; fmtDesc += 2, desc++)`
`471`	`475`	`{`
`@@ -477,7 +481,7 @@ void TraceDscFromMsg::fillParams()`
`477`	`481`	`const ULONG nullOffset = (IPTR) fmtDesc[1].dsc_address;`
`478`	`482`	`const SSHORT* const nullPtr = (const SSHORT*) (m_inMsg + nullOffset);`
`479`	`483`	`if (*nullPtr == -1)`
`480`		`- desc->setNull();`
	`484`	`+ desc->dsc_flags \|= DSC_null;`
`481`	`485`	`}`
`482`	`486`	`}`
`483`	`487`