From 895d6e0000b824809a19d42aee0955df76af8c86 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 21 Jun 2015 22:07:10 -0700 Subject: Comparing the address of a member to 0 is pointless Or... this code doesn't do what you think it does. Signed-off-by: Dirk Hohndel --- dive.c | 4 ++-- qt-ui/profile/profilewidget2.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dive.c b/dive.c index 37f99048f..02c1090d9 100644 --- a/dive.c +++ b/dive.c @@ -1055,10 +1055,10 @@ static struct event *find_previous_event(struct divecomputer *dc, struct event * struct event *ev = dc->events; struct event *previous = NULL; - if (!event->name) + if (same_string(event->name, "")) return NULL; while (ev && ev != event) { - if (ev->name && !strcmp(ev->name, event->name)) + if (same_string(ev->name, event->name)) previous = ev; ev = ev->next; } diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp index cd6a7a157..be09fc5ea 100644 --- a/qt-ui/profile/profilewidget2.cpp +++ b/qt-ui/profile/profilewidget2.cpp @@ -1329,7 +1329,7 @@ void ProfileWidget2::hideEvents() if (QMessageBox::question(MainWindow::instance(), TITLE_OR_TEXT(tr("Hide events"), tr("Hide all %1 events?").arg(event->name)), QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) { - if (event->name) { + if (!same_string(event->name, "")) { for (int i = 0; i < evn_used; i++) { if (same_string(event->name, ev_namelist[i].ev_name)) { ev_namelist[i].plot_ev = false; -- cgit v1.2.3-70-g09d2