Hmz. I don't get why the build is marked as failed, exit status is 1 with everything compiling and no test failures.

If you wonder why https://travis-ci.org/danmar/cppcheck/builds/6854731 fails.. I am not sure. Both the GCC and CLANG report says there is a segmentation fault. Can you try running this command on your computer and see what happens:
cppcheck --error-exitcode=1 -Ilib --enable=style --suppress=duplicateBranch -q cli gui lib -igui/test

Travis is not 100% reliable. It is possible that if you restart the checking it will pass.

my fault after all... I couldn't read that there was a segfault from the output though.

When you start to feel ready with all changes.. I want that all those commits are squashed into a single commit.

I am not sure how you do it but it is possible to do it.

should be done...

I can't apply the patch directly. You ran dmake and so did I. Sorry for the trouble. You need to merge the changes.

The patch wasn't formatted. did you run astyle again?

I get this:

Assertion failed in test/testassert.cpp at line 70
Expected:

Actual:
[test.cpp:7]: (warning) Assert statement calls a function which may have desired side effects: 'foo'.\n

Don't you get this?

I would prefer if this:

const Token *endTok = tok ? tok->next()->link() : NULL;

Is moved to the start of the while loop.

It really shouldn't be NULL. But feel free to add a assert(endTok != NULL); after the assignment

it seems that travis didnt run the testassert tests. the makefile in the patch doesnt build testassert.

I figured the CI would run the tests for me, they're really slow on my machine. But then again, I apparently forgot to rerun dmake. Sorry.

Regarding the merge to a single commit:

Use "git rebase -i origin/master" and then you can select which commits should be merge together.
(in fact this command can do a lot more, it's a swiss army knife...)

Better play this on a fresh checkout of your local branch. In case anything goes wrong, you can just throw the branch away and try again.

will be fixing this tomorrow- sorry for the delay.

it looks like the test was executed this time, and I re-ran both the formatting and dmake, but dmake didn't change t he Makefile further. Also, I was unsure how to refactor the while loop as you proposed.
Sorry about that too and good luck with this patch...

Also, I was unsure how to refactor the while loop as you proposed.

Nevermind.

I am not sure what happened. The only commit I see here in this pull request is the 4 days old 5594b4a.

But this looks interesting:
16a2903

I applied your changes with:
e23038c

Thanks!

Feel free to close the ticket now.