From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 6 Dec 2010 08:31:15 +0000 (+0100)
Subject: Merge branch 'collectd-4.9' into collectd-4.10
X-Git-Tag: collectd-5.0.0-beta0~3^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=dbcb0610ae7dfa0155b04aa4174ec35a1058d18e;hp=bd6038590ee2b3de949ff087bc4a9214613b97b1;p=collectd.git

Merge branch 'collectd-4.9' into collectd-4.10
---

diff --git a/configure.in b/configure.in
index a47fed03..89c870b4 100644
--- a/configure.in
+++ b/configure.in
@@ -3391,7 +3391,7 @@ AM_CONDITIONAL(BUILD_WITH_LIBTOKYOTYRANT, test "x$with_libtokyotyrant" = "xyes")
 with_libupsclient_config=""
 with_libupsclient_cflags=""
 with_libupsclient_libs=""
-AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])],
+AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the upsclient library.])],
 [
 	if test "x$withval" = "xno"
 	then
diff --git a/src/common.c b/src/common.c
index 2598036d..c3e502ad 100644
--- a/src/common.c
+++ b/src/common.c
@@ -863,11 +863,11 @@ int parse_value (const char *value, value_t *ret_value, int ds_type)
       break;
 
     case DS_TYPE_DERIVE:
-      ret_value->counter = (derive_t) strtoll (value, &endptr, 0);
+      ret_value->derive = (derive_t) strtoll (value, &endptr, 0);
       break;
 
     case DS_TYPE_ABSOLUTE:
-      ret_value->counter = (absolute_t) strtoull (value, &endptr, 0);
+      ret_value->absolute = (absolute_t) strtoull (value, &endptr, 0);
       break;
 
     default: