address some feedback

alexbatashev · alexbatashev · commit ae1184df1012 · 2021-09-18T14:33:06.000+03:00
diff --git a/xptifw/src/xpti_trace_framework.cpp b/xptifw/src/xpti_trace_framework.cpp
@@ -995,10 +995,10 @@ class Framework {
 private:
   friend void ::xptiFrameworkFinalize();
 
-  static Framework *release() {
+  static void release() {
     Framework *TmpFramework = MInstance.load(std::memory_order_relaxed);
     MInstance.store(nullptr, std::memory_order_relaxed);
-    return TmpFramework;
+    delete TmpFramework;
   }
 
   /// Stores singleton instance
@@ -1041,9 +1041,7 @@ XPTI_EXPORT_API void xptiFrameworkFinalize() {
 
   xpti::GFrameworkReferenceCounter--;
   if (xpti::GFrameworkReferenceCounter == 0) {
-    xpti::Framework *FW = xpti::Framework::release();
-    if (FW)
-      delete FW;
+    xpti::Framework::release();
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -995,10 +995,10 @@ class Framework {`
`995`	`995`	`private:`
`996`	`996`	`friend void ::xptiFrameworkFinalize();`
`997`	`997`
`998`		`- static Framework *release() {`
	`998`	`+ static void release() {`
`999`	`999`	`Framework *TmpFramework = MInstance.load(std::memory_order_relaxed);`
`1000`	`1000`	`MInstance.store(nullptr, std::memory_order_relaxed);`
`1001`		`- return TmpFramework;`
	`1001`	`+ delete TmpFramework;`
`1002`	`1002`	`}`
`1003`	`1003`
`1004`	`1004`	`/// Stores singleton instance`
`@@ -1041,9 +1041,7 @@ XPTI_EXPORT_API void xptiFrameworkFinalize() {`
`1041`	`1041`
`1042`	`1042`	`xpti::GFrameworkReferenceCounter--;`
`1043`	`1043`	`if (xpti::GFrameworkReferenceCounter == 0) {`
`1044`		`- xpti::Framework *FW = xpti::Framework::release();`
`1045`		`- if (FW)`
`1046`		`- delete FW;`
	`1044`	`+ xpti::Framework::release();`
`1047`	`1045`	`}`
`1048`	`1046`	`}`
`1049`	`1047`