X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftypes_list.c;h=a9af9e6d29f783eeed53f8fb1836414511d77ac4;hb=5bf80d6ecad0e6684eb38cf2de8e56b4f6b50fe3;hp=ff8426286ac515472b63285aee83fe7df0d45cb7;hpb=c74b709edf61a3b7dfc24032f609956f0feb56e7;p=collectd.git diff --git a/src/types_list.c b/src/types_list.c index ff842628..a9af9e6d 100644 --- a/src/types_list.c +++ b/src/types_list.c @@ -62,8 +62,7 @@ static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len) return (-1); } - strncpy (dsrc->name, fields[0], sizeof (dsrc->name)); - dsrc->name[sizeof (dsrc->name) - 1] = '\0'; + sstrncpy (dsrc->name, fields[0], sizeof (dsrc->name)); if (strcasecmp (fields[1], "GAUGE") == 0) dsrc->type = DS_TYPE_GAUGE; @@ -85,9 +84,6 @@ static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len) else dsrc->max = atof (fields[3]); - DEBUG ("parse_ds: dsrc = {%s, %i, %lf, %lf};", - dsrc->name, dsrc->type, dsrc->min, dsrc->max); - return (0); } /* int parse_ds */ @@ -108,8 +104,7 @@ static void parse_line (char *buf) memset (ds, '\0', sizeof (data_set_t)); - strncpy (ds->type, fields[0], sizeof (ds->type)); - ds->type[sizeof (ds->type) - 1] = '\0'; + sstrncpy (ds->type, fields[0], sizeof (ds->type)); ds->ds_num = fields_num - 1; ds->ds = (data_source_t *) calloc (ds->ds_num, sizeof (data_source_t)); @@ -125,9 +120,6 @@ static void parse_line (char *buf) return; } - DEBUG ("parse_line: ds = {%s, %i, %p};", - ds->type, ds->ds_num, (void *) ds->ds); - plugin_register_data_set (ds); sfree (ds->ds);