Fix various minor cppcheck defects

Frank Winklmeierrequested to merge
fwinkl/athena:cppcheck3 into main

Fix cppcheck defects as seen in !77034 (merged).

Merge request reports