Merge branch 'cppcheck'

diff --cc src/apache.c
Simple merge

diff --cc src/ascent.c
Simple merge

diff --cc src/bind.c
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/curl_xml.c
Simple merge

diff --cc src/dbi.c
Simple merge

diff --cc src/match_value.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/utils_db_query.c
Simple merge