X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftypes_list.c;h=41bb4033f39a9f63fde420e5142361e8b0d5ebe2;hb=1122c8fd30065b5990a5b798b7bfd8891736def9;hp=49714176374a2979a24e5c161ac6b303d184708f;hpb=9fcc56456620f6f5663e7b2ca2168d612dc6bd6c;p=collectd.git

diff --git a/src/types_list.c b/src/types_list.c
index 49714176..41bb4033 100644
--- a/src/types_list.c
+++ b/src/types_list.c
@@ -24,6 +24,7 @@
 
 #include "plugin.h"
 #include "configfile.h"
+#include "types_list.h"
 
 static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
 {
@@ -102,6 +103,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 +160,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)