[Pkg-voip-commits] [bctoolbox] 15/57: clean code (remove strange global symbol)

daniel at gnoutcheff.name daniel at gnoutcheff.name
Thu Mar 30 04:31:31 UTC 2017


This is an automated email from the git hooks/post-receive script.

gnoutchd-guest pushed a commit to branch debian/sid
in repository bctoolbox.

commit ce17bed9342850a503723f65b1d13fc74a551a28
Author: Simon Morlat <simon.morlat at linphone.org>
Date:   Wed Nov 23 21:37:33 2016 +0100

    clean code (remove strange global symbol)
---
 src/utils/exception.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/utils/exception.cc b/src/utils/exception.cc
index 4b66ba5..118e5a0 100644
--- a/src/utils/exception.cc
+++ b/src/utils/exception.cc
@@ -36,7 +36,6 @@ static void uncaught_handler() {
 	abort();
 }
 
-BctbxException e;
 
 BctbxException::BctbxException(const char *message) : mOffset(1), mSize(0) {
 	mSize = backtrace(mArray, sizeof(mArray) / sizeof(void *));
@@ -93,23 +92,22 @@ void BctbxException::printStackTrace(std::ostream &os) const {
 		char *demangled = NULL;
 		int status = -1;
 		if (dladdr(mArray[i], &info) && info.dli_sname) {
-		demangled = abi::__cxa_demangle(info.dli_sname, NULL, 0, &status);
-		
+			demangled = abi::__cxa_demangle(info.dli_sname, NULL, 0, &status);
 			os << position++ << setw(20) << basename((char*)info.dli_fname) << setw(16) << info.dli_saddr ;
 			os << " ";
 			if (demangled) {
 				os << demangled;
 				free(demangled);
 			}
-			else
+			else{
 				os << info.dli_sname;
-			
+			}
 		} else {
 			os << bt[i];
 		}
 		os << std::endl;
 	}
-	delete (bt);
+	free(bt);
 }
 
 const std::string &BctbxException::str() const {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bctoolbox.git



More information about the Pkg-voip-commits mailing list