From c86d055db77cdeef6049449ac79fe404c40d28cc Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 12 May 2014 14:58:15 -0300 Subject: Do not check for null before free. C specs says that we can safelly free a NULL pointer, so there's no reason to check if it's null before freeing it. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- divecomputer.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'divecomputer.cpp') diff --git a/divecomputer.cpp b/divecomputer.cpp index c02bbea55..6044f1aa6 100644 --- a/divecomputer.cpp +++ b/divecomputer.cpp @@ -130,10 +130,9 @@ void set_default_dive_computer(const char *vendor, const char *product) return; if (is_default_dive_computer(vendor, product)) return; - if (default_dive_computer_vendor) - free((void *)default_dive_computer_vendor); - if (default_dive_computer_product) - free((void *)default_dive_computer_product); + + free((void *)default_dive_computer_vendor); + free((void *)default_dive_computer_product); default_dive_computer_vendor = strdup(vendor); default_dive_computer_product = strdup(product); s.beginGroup("DiveComputer"); @@ -150,8 +149,8 @@ void set_default_dive_computer_device(const char *name) return; if (is_default_dive_computer_device(name)) return; - if (default_dive_computer_device) - free((void *)default_dive_computer_device); + + free((void *)default_dive_computer_device); default_dive_computer_device = strdup(name); s.beginGroup("DiveComputer"); s.setValue("dive_computer_device", name); -- cgit v1.2.3-70-g09d2