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 /qt-ui | |
| 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 'qt-ui')
| -rw-r--r-- | qt-ui/downloadfromdivecomputer.cpp | 8 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp index bc829249c..17c2a4eaa 100644 --- a/qt-ui/downloadfromdivecomputer.cpp +++ b/qt-ui/downloadfromdivecomputer.cpp @@ -243,7 +243,7 @@ void DownloadFromDCWidget::fill_computer_list() if (!productList["Uemis"].contains("Zurich")) productList["Uemis"].push_back("Zurich"); - descriptorLookup[QString("UemisZurich")] = (dc_descriptor_t *)mydescriptor; + descriptorLookup["UemisZurich"] = (dc_descriptor_t *)mydescriptor; qSort(vendorList); } @@ -322,8 +322,7 @@ void DownloadFromDCWidget::pickLogFile() logFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer download logfile"), filename, tr("Log files (*.log)")); if (!logFile.isEmpty()) { - if (logfile_name) - free(logfile_name); + free(logfile_name); logfile_name = strdup(logFile.toUtf8().data()); } } @@ -351,8 +350,7 @@ void DownloadFromDCWidget::pickDumpFile() dumpFile = QFileDialog::getSaveFileName(this, tr("Choose file for divecomputer binary dump file"), filename, tr("Dump files (*.bin)")); if (!dumpFile.isEmpty()) { - if (dumpfile_name) - free(dumpfile_name); + free(dumpfile_name); dumpfile_name = strdup(dumpFile.toUtf8().data()); } } diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 769f486de..709693c30 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -245,10 +245,9 @@ void MainWindow::on_actionClose_triggered() /* clear the selection and the statistics */ selected_dive = -1; - if (existing_filename) { - free((void *)existing_filename); - existing_filename = NULL; - } + free((void *)existing_filename); + existing_filename = NULL; + cleanUpEmpty(); mark_divelist_changed(false); |