X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=5386739fbc372e96638ac55c79a91e8ca3af3ca9;hb=9faff71de9d74939223192766c93e1d18c2d1186;hp=1608d5201b6234b58eb4d27faef6ee98eec349c6;hpb=2ab196d6fab9e2e4613a2a41412333a4bff1b4bf;p=collectd.git

diff --git a/src/common.c b/src/common.c
index 1608d520..5386739f 100644
--- a/src/common.c
+++ b/src/common.c
@@ -2,18 +2,23 @@
  * collectd - src/common.c
  * Copyright (C) 2005-2014  Florian octo Forster
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Florian octo Forster <octo at collectd.org>
@@ -1068,9 +1073,9 @@ int parse_value (const char *value_orig, value_t *ret_value, int ds_type)
   }
 
   if (value == endptr) {
-    sfree (value);
     ERROR ("parse_value: Failed to parse string as %s: %s.",
         DS_TYPE_TO_STRING (ds_type), value);
+    sfree (value);
     return -1;
   }
   else if ((NULL != endptr) && ('\0' != *endptr))
@@ -1538,6 +1543,26 @@ int strtoderive (const char *string, derive_t *ret_value) /* {{{ */
 	return (0);
 } /* }}} int strtoderive */
 
+int strtogauge (const char *string, gauge_t *ret_value) /* {{{ */
+{
+	gauge_t tmp;
+	char *endptr = NULL;
+
+	if ((string == NULL) || (ret_value == NULL))
+		return (EINVAL);
+
+	errno = 0;
+	endptr = NULL;
+	tmp = (gauge_t) strtod (string, &endptr);
+	if (errno != 0)
+		return (errno);
+	else if ((endptr == NULL) || (*endptr != 0))
+		return (EINVAL);
+
+	*ret_value = tmp;
+	return (0);
+} /* }}} int strtogauge */
+
 int strarray_add (char ***ret_array, size_t *ret_array_len, char const *str) /* {{{ */
 {
 	char **array;