X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftypes_list.c;h=7600c346ecc1e8c901460a029c2ead4c167e5576;hb=10075e6fe3c384b73c2dd398a1435f8d10e56654;hp=3be792d5ca11bbd741f9b599a517c9cfea7da9ac;hpb=af46a5f31a0e8d4279d63d8ca9232dbd433dfb25;p=collectd.git diff --git a/src/types_list.c b/src/types_list.c index 3be792d5..7600c346 100644 --- a/src/types_list.c +++ b/src/types_list.c @@ -34,7 +34,7 @@ static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len) if (buf_len < 11) { - ERROR ("parse_ds: (buf_len = %u) < 11", buf_len); + ERROR ("parse_ds: (buf_len = %zu) < 11", buf_len); return (-1); } @@ -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; @@ -105,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));