diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-06 14:08:17 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-05-06 14:15:59 -0700 |
| commit | 0c836ebc47cab2f37274ae03ab2be6c7b2fd0456 (patch) | |
| tree | 2c55ca0c5aa1bb6e9dcb6cc8bb920cb28c75b5cd /qt-ui | |
| parent | 024420a60ddf7d18a6bd2ce4aad30344be0edbac (diff) | |
| download | subsurface-0c836ebc47cab2f37274ae03ab2be6c7b2fd0456.tar.gz | |
Simplify string comparison
This is based on Linus' idea on the mailing list.
Treat NULL strings and empty strings as identical.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/maintab.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index ec4065d85..5bcc07cf9 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -856,12 +856,11 @@ void MainTab::rejectChanges() // this macro is rather fragile and is intended to be used as WHAT inside // an invocation of EDIT_SELECTED_DIVES(WHAT) -#define EDIT_TEXT(what, text) \ - if ((!mydive->what && !current_dive->what) || \ - (mydive->what && current_dive->what && strcmp(mydive->what, current_dive->what) == 0)) { \ - QByteArray textByteArray = text.toUtf8(); \ - free(mydive->what); \ - mydive->what = strdup(textByteArray.data()); \ +#define EDIT_TEXT(what, text) \ + if (same_string(mydive->what, current_dive->what)) { \ + QByteArray textByteArray = text.toUtf8(); \ + free(mydive->what); \ + mydive->what = strdup(textByteArray.data()); \ } #define EDIT_VALUE(what, value) \ |