summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <git@matthiasm.com>2018-12-29 01:19:51 +0100
committerMatthias Melcher <git@matthiasm.com>2018-12-29 01:19:51 +0100
commit29fe0c43df7bad2df0f4445994b9d5d851bc2cdb (patch)
treeddb2017b80092d90d1e4bbce873ecee1550c9c84
parente169b1941fb1b3cfb8333ec27ab8f04671850ab9 (diff)
Remove obsolete condition to make static analysis happy.
-rw-r--r--src/Fl_Menu_add.cxx2
-rw-r--r--test/blocks.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx
index 32da93df3..57534f4e3 100644
--- a/src/Fl_Menu_add.cxx
+++ b/src/Fl_Menu_add.cxx
@@ -176,7 +176,7 @@ int Fl_Menu_Item::insert(
if (m->flags&FL_SUBMENU && !compare(item, m->text)) break;
if (!m->text) { /* create a new menu */
- int n = (index==-1) ? (int) (m-array) : index;
+ int n = (int)(m-array); /* index is not used if label contains a path */
array = array_insert(array, msize, n, item, FL_SUBMENU|flags1);
msize++;
array = array_insert(array, msize, n+1, 0, 0);
diff --git a/test/blocks.cxx b/test/blocks.cxx
index c7d3979ed..6135313ba 100644
--- a/test/blocks.cxx
+++ b/test/blocks.cxx
@@ -771,7 +771,7 @@ int BlockWindow::handle(int event) {
b = 0;
for (j = 0, c = columns_; !count && j < num_columns_; j ++, c ++)
- for (k = 0, b = c->blocks; !count && k < c->num_blocks; k ++, b ++)
+ for (k = 0, b = c->blocks; k < c->num_blocks; k ++, b ++)
if (mx >= c->x && mx < (c->x + BLOCK_SIZE) &&
my >= b->y && my < (b->y + BLOCK_SIZE)) {
if (b->bomb) count = bomb(b->color);