dissect-image: fix path building for non-raw images (#41674)

If the passed in image path didn't end with .raw, we'd return an empty
string + suffix instead of the intended image + suffix path.

---

Also, fix two more nits that came up repeatedly in my searches.

diff --cc src/shared/dissect-image.c
Simple merge