From 453aeb7ca9dedecc3b2e42ac31d6f7a8dff513b2 Mon Sep 17 00:00:00 2001 From: JensHoffmann Date: Sun, 8 Dec 2013 08:52:56 +0100 Subject: [PATCH] Take advantage of delete not acting on null values The code 'delete 0' does nothing. So you can shorten code like: if (x != 0) { delete x } to simply: delete x (cherry picked from commit f7ecf6f8fc7ebdfdb9b9b4ca1000161ccbf56379) --- src/document/Document.cc | 5 +---- src/host/Host.cc | 5 +---- src/image/Image.cc | 5 +---- src/vm/VirtualMachine.cc | 34 +++++++--------------------------- src/vm_template/VMTemplate.cc | 5 +---- src/vnm/VirtualNetwork.cc | 11 ++--------- 6 files changed, 13 insertions(+), 52 deletions(-) diff --git a/src/document/Document.cc b/src/document/Document.cc index cdebf1036e..a14c42adb8 100644 --- a/src/document/Document.cc +++ b/src/document/Document.cc @@ -47,10 +47,7 @@ Document::Document( int id, Document::~Document() { - if ( obj_template != 0 ) - { - delete obj_template; - } + delete obj_template; } /* ************************************************************************ */ diff --git a/src/host/Host.cc b/src/host/Host.cc index e09b6e19b5..dba4c00490 100644 --- a/src/host/Host.cc +++ b/src/host/Host.cc @@ -49,10 +49,7 @@ Host::Host( Host::~Host() { - if ( obj_template != 0 ) - { - delete obj_template; - } + delete obj_template; } /* ************************************************************************ */ diff --git a/src/image/Image.cc b/src/image/Image.cc index 56a1559dfc..0b2c4b0c43 100644 --- a/src/image/Image.cc +++ b/src/image/Image.cc @@ -72,10 +72,7 @@ Image::Image(int _uid, Image::~Image() { - if (obj_template != 0) - { - delete obj_template; - } + delete obj_template; } /* ************************************************************************ */ diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index 45273f5373..6b4cf5bac2 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -83,23 +83,12 @@ VirtualMachine::~VirtualMachine() { for (unsigned int i=0 ; i < history_records.size() ; i++) { - delete history_records[i]; + delete history_records[i]; } - if (_log != 0) - { - delete _log; - } - - if (obj_template != 0) - { - delete obj_template; - } - - if (user_obj_template != 0) - { - delete user_obj_template; - } + delete _log; + delete obj_template; + delete user_obj_template; } /* ************************************************************************** */ @@ -788,10 +777,7 @@ int VirtualMachine::parse_context(string& error_str) for (int i = 0; i < num ; i++) { - if (array_context[i] != 0) - { - delete array_context[i]; - } + delete array_context[i]; } // ------------------------------------------------------------------------- @@ -911,10 +897,7 @@ int VirtualMachine::parse_context(string& error_str) error_cleanup: for (int i = 0; i < num ; i++) { - if (array_context[i] != 0) - { - delete array_context[i]; - } + delete array_context[i]; } return -1; @@ -1042,10 +1025,7 @@ int VirtualMachine::parse_requirements(string& error_str) error_cleanup: for (int i = 0; i < num ; i++) { - if (array_reqs[i] != 0) - { - delete array_reqs[i]; - } + delete array_reqs[i]; } return -1; diff --git a/src/vm_template/VMTemplate.cc b/src/vm_template/VMTemplate.cc index 28683784ff..797e2d5523 100644 --- a/src/vm_template/VMTemplate.cc +++ b/src/vm_template/VMTemplate.cc @@ -49,10 +49,7 @@ VMTemplate::VMTemplate(int id, VMTemplate::~VMTemplate() { - if ( obj_template != 0 ) - { - delete obj_template; - } + delete obj_template; } /* ************************************************************************ */ diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc index eeca10cf11..cae8608d81 100644 --- a/src/vnm/VirtualNetwork.cc +++ b/src/vnm/VirtualNetwork.cc @@ -68,15 +68,8 @@ VirtualNetwork::VirtualNetwork(int _uid, VirtualNetwork::~VirtualNetwork() { - if (leases != 0) - { - delete leases; - } - - if (obj_template != 0) - { - delete obj_template; - } + delete leases; + delete obj_template; } /* ************************************************************************** */