Minor refactoring of file comparison with delta (also removed warning under Linux).
Minor refactoring of file comparison with delta (also removed warning under Linux).

marc-sturm/cppTFW,marc-sturm/cppTFW