Fix 1908

[jajhall]

Run clang formatting

[jajhall]

@fwesselm There were some changes when I ran clang formatting locally. However, there does seem to be an error in the clang format test on GitHub.

@galabovaa Please would you look into this

Looking again, maybe it's a consequence of updating my Ubuntu version. My clang version may have changed

[fwesselm]

@jajhall I also saw that there were changes when I ran the clang formatting. The test-clang-format now seems to run fine again in my branch. If you like, I could create another pull request.

[jajhall]

So, I've run clang-format on my desktop running Ubuntu 22.04 (and clang-format 14.0.0-1ubuntu1.1), and the test-clang-format CI tests work OK

I've got stuff to push from my laptop running Ubuntu 24.04 (and clang-format 18.1.3 (1ubuntu1)) and will see whether the test-clang-format CI tests work OK

[jajhall]

Fine now!