From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 19 Aug 2008 07:27:14 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~78
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=abfe65ffb5239060c0c9558d916bbeddee0bc86c;p=collectd.git

Merge branch 'collectd-4.4'

Conflicts:

	src/tcpconns.c
---

abfe65ffb5239060c0c9558d916bbeddee0bc86c
diff --cc src/tcpconns.c
index 655c53e5,2e115922..fac6a18a
--- a/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++)
      {