[master] Finished merge of trac3919 (cppcheck small fixes)

diff --cc ChangeLog
index 618459abffb988f3d0d6e399c70bf018d8045f5f,0e179ff4cb2d0ae30405293eb269a1e36caf941a..f8704f5eeb93ec748dfa305f81eb8455033c8de1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,3 +1,14 @@@
++970.  [bug]           fdupont
++      Refactored some code to suppress cppcheck warnings.
++      (Trac #3919, git xxx)
++
 +969.  [func]          tomek
 +      KEA_SOCKET_TEST_DIR environment variable can be used to specify
 +      the directory for opening Unix sockets during tests. That may
 +      be used to avoid path length limitations when running unit-tests
 +      in deeply nested directories.
 +      (Trac #3918, git 9cfd502e8d4605eaf34f8744f90272dc3e8a3e34)
 +
  968.  [func]          fdupont
        Changed all occurrences of unlink() to the more portable remove()
        to avoid problems on operating systems where the former is not