Merge branch 'collectd-4.10' into collectd-5.3

[collectd.git] / src / types_list.c

diff --git a/src/types_list.c b/src/types_list.c
index 49714176374a2979a24e5c161ac6b303d184708f..887b43d87c420d76a823a64452fe788893ff1bd1 100644 (file)
--- a/src/types_list.c
+++ b/src/types_list.c
@@ -102,6 +102,10 @@ static void parse_line (char *buf)
   if (fields_num < 2)
     return;
 
+  /* Ignore lines which begin with a hash sign. */
+  if (fields[0][0] == '#')
+    return;
+
   ds = (data_set_t *) malloc (sizeof (data_set_t));
   if (ds == NULL)
     return;
@@ -155,7 +159,7 @@ static void parse_file (FILE *fh)
       continue;
 
     while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
-         || (buf[buf_len - 1] == '\n')))
+         || (buf[buf_len - 1] == '\r')))
       buf[--buf_len] = '\0';
 
     if (buf_len == 0)