diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-05-12 14:58:15 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-13 09:26:50 +0900 |
| commit | c86d055db77cdeef6049449ac79fe404c40d28cc (patch) | |
| tree | f0e53f8d42567a670567e7600de287dcdde5b627 /divecomputer.cpp | |
| parent | e0c0ac5d5c7c218011278fbe57da291a7e10c8eb (diff) | |
| download | subsurface-c86d055db77cdeef6049449ac79fe404c40d28cc.tar.gz | |
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 <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divecomputer.cpp')
| -rw-r--r-- | divecomputer.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
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); |