Merge branch 'collectd-4.4'

Conflicts:

	src/tcpconns.c

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/swap.c
Simple merge

diff --cc src/tcpconns.c
index 655c53e5689ff35647216d50b2a4b01e4bbb1cf2,2e1159229da7c3d67b32a18133839e9aea019be2..fac6a18a2917d2ef2856edf8d2a7ab7f5d17bb4a
--- 1/src/tcpconns.c
--- 2/src/tcpconns.c
+++ b/src/tcpconns.c
@@@ -142,8 -141,9 +142,8 @@@ static void conn_submit_port_entry (por
    if (((port_collect_listening != 0) && (pe->flags & PORT_IS_LISTENING))
        || (pe->flags & PORT_COLLECT_LOCAL))
    {
 -    snprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
 +    ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
-       "%hu-local", pe->port);
+       "%"PRIu16"-local", pe->port);
 -    vl.plugin_instance[sizeof (vl.plugin_instance) - 1] = '\0';
  
      for (i = 1; i <= TCP_STATE_MAX; i++)
      {
@@@ -157,8 -158,9 +157,8 @@@
  
    if (pe->flags & PORT_COLLECT_REMOTE)
    {
 -    snprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
 +    ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
-       "%hu-remote", pe->port);
+       "%"PRIu16"-remote", pe->port);
 -    vl.plugin_instance[sizeof (vl.plugin_instance) - 1] = '\0';
  
      for (i = 1; i <= TCP_STATE_MAX; i++)
      {