From: Florian Forster <octo@noris.net>
Date: Wed, 15 Dec 2010 14:56:14 +0000 (+0100)
Subject: modbus plugin: Restore compatibility to libmodbus 2.0.3.
X-Git-Tag: collectd-5.0.0-beta1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f4c894f3f0d7c88746ba9011b018c61d25071d9b;p=collectd.git

modbus plugin: Restore compatibility to libmodbus 2.0.3.

This is the current "stable" version.
---

diff --git a/src/modbus.c b/src/modbus.c
index 3824097c..6a753e15 100644
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -281,10 +281,8 @@ static int mb_init_connection (mb_host_t *host) /* {{{ */
 
   modbus_set_debug (&host->connection, 1);
 
-#if 0
   /* We'll do the error handling ourselves. */
   modbus_set_error_handling (&host->connection, NOP_ON_ERROR);
-#endif
 
   if ((host->port < 1) || (host->port > 65535))
     host->port = MODBUS_TCP_DEFAULT_PORT;
@@ -293,10 +291,8 @@ static int mb_init_connection (mb_host_t *host) /* {{{ */
       host->node, host->port);
 
   modbus_init_tcp (&host->connection,
-      /* host = */ host->node);
-#if 0
+      /* host = */ host->node,
       /* port = */ host->port);
-#endif
 
   status = modbus_connect (&host->connection);
   if (status != 0)
@@ -325,7 +321,7 @@ static int mb_init_connection (mb_host_t *host) /* {{{ */
 static int mb_read_data (mb_host_t *host, mb_slave_t *slave, /* {{{ */
     mb_data_t *data)
 {
-  int values[2];
+  uint16_t values[2];
   int values_num;
   const data_set_t *ds;
   int status;