From 4e1f451520975868659f4c00d00883f5f1cd5805 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Dec 2008 19:31:00 +0000 Subject: Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite/freestore-mgmt.html#faq-16.8 Apologies for the big commit. git-svn-id: svn://localhost/ardour2/branches/3.0@4332 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/pbd/xml++.cc | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'libs/pbd/xml++.cc') diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc index a42923132b..7d406d6c30 100644 --- a/libs/pbd/xml++.cc +++ b/libs/pbd/xml++.cc @@ -39,9 +39,7 @@ XMLTree::XMLTree(const XMLTree * from) XMLTree::~XMLTree() { - if (_root) { - delete _root; - } + delete _root; } int @@ -63,10 +61,9 @@ XMLTree::read_internal(bool validate) { //shouldnt be used anywhere ATM, remove if so! assert(!validate); - if (_root) { - delete _root; - _root = 0; - } + + delete _root; + _root = 0; xmlParserCtxtPtr ctxt; /* the parser context */ xmlDocPtr doc; /* the resulting document tree */ @@ -119,10 +116,8 @@ XMLTree::read_buffer(const string & buffer) _filename = ""; - if (_root) { - delete _root; - _root = 0; - } + delete _root; + _root = 0; doc = xmlParseMemory((char *) buffer.c_str(), buffer.length()); if (!doc) { -- cgit v1.2.3