Replace deprecated bzero() by memset()
Chocobo1 committed
Sep 25, 2016 at 18:39 UTC
31ecff0662036f4a10c23714187ba5edba6ce213
2 files changed
+17
-17
src/proc_net_softnet_stat.c
+3
-3
@@ -41,16 +41,16 @@ int do_proc_net_softnet_stat(int update_every, unsigned long long dt) {
41
42
if(lines > 200) lines = 200;
43
if(words > 50) words = 50;
44
-
44
+
45
if(unlikely(!data || lines > allocated_lines || words > allocated_columns)) {
46
freez(data);
47
allocated_lines = lines;
48
allocated_columns = words;
49
data = mallocz((allocated_lines + 1) * allocated_columns * sizeof(uint32_t));
50
}
51
-
51
+
52
// initialize to zero
53
- bzero(data, (allocated_lines + 1) * allocated_columns * sizeof(uint32_t));
53
+ memset(data, 0, (allocated_lines + 1) * allocated_columns * sizeof(uint32_t));
54
55
// parse the values
56
for(l = 0; l < lines ;l++) {
src/rrd.c
+14
-14
@@ -422,7 +422,7 @@ void rrdset_reset(RRDSET *st)
422
rd->last_collected_time.tv_sec = 0;
423
rd->last_collected_time.tv_usec = 0;
424
rd->counter = 0;
425
- bzero(rd->values, rd->entries * sizeof(storage_number));
425
+ memset(rd->values, 0, rd->entries * sizeof(storage_number));
426
}
427
}
428
@@ -468,29 +468,29 @@ RRDSET *rrdset_create(const char *type, const char *id, const char *name, const
468
if(strcmp(st->magic, RRDSET_MAGIC) != 0) {
469
errno = 0;
470
info("Initializing file %s.", fullfilename);
471
- bzero(st, size);
471
+ memset(st, 0, size);
472
}
473
else if(strcmp(st->id, fullid) != 0) {
474
errno = 0;
475
error("File %s contents are not for chart %s. Clearing it.", fullfilename, fullid);
476
// munmap(st, size);
477
// st = NULL;
478
- bzero(st, size);
478
+ memset(st, 0, size);
479
}
480
else if(st->memsize != size || st->entries != entries) {
481
errno = 0;
482
error("File %s does not have the desired size. Clearing it.", fullfilename);
483
- bzero(st, size);
483
+ memset(st, 0, size);
484
}
485
else if(st->update_every != update_every) {
486
errno = 0;
487
error("File %s does not have the desired update frequency. Clearing it.", fullfilename);
488
- bzero(st, size);
488
+ memset(st, 0, size);
489
}
490
else if((time(NULL) - st->last_updated.tv_sec) > update_every * entries) {
491
errno = 0;
492
error("File %s is too old. Clearing it.", fullfilename);
493
- bzero(st, size);
493
+ memset(st, 0, size);
494
}
495
}
496
@@ -616,44 +616,44 @@ RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier
616
if(strcmp(rd->magic, RRDDIMENSION_MAGIC) != 0) {
617
errno = 0;
618
info("Initializing file %s.", fullfilename);
619
- bzero(rd, size);
619
+ memset(rd, 0, size);
620
}
621
else if(rd->memsize != size) {
622
errno = 0;
623
error("File %s does not have the desired size. Clearing it.", fullfilename);
624
- bzero(rd, size);
624
+ memset(rd, 0, size);
625
}
626
else if(rd->multiplier != multiplier) {
627
errno = 0;
628
error("File %s does not have the same multiplier. Clearing it.", fullfilename);
629
- bzero(rd, size);
629
+ memset(rd, 0, size);
630
}
631
else if(rd->divisor != divisor) {
632
errno = 0;
633
error("File %s does not have the same divisor. Clearing it.", fullfilename);
634
- bzero(rd, size);
634
+ memset(rd, 0, size);
635
}
636
else if(rd->algorithm != algorithm) {
637
errno = 0;
638
error("File %s does not have the same algorithm. Clearing it.", fullfilename);
639
- bzero(rd, size);
639
+ memset(rd, 0, size);
640
}
641
else if(rd->update_every != st->update_every) {
642
errno = 0;
643
error("File %s does not have the same refresh frequency. Clearing it.", fullfilename);
644
- bzero(rd, size);
644
+ memset(rd, 0, size);
645
}
646
else if(usec_dt(&now, &rd->last_collected_time) > (rd->entries * rd->update_every * 1000000ULL)) {
647
errno = 0;
648
error("File %s is too old. Clearing it.", fullfilename);
649
- bzero(rd, size);
649
+ memset(rd, 0, size);
650
}
651
else if(strcmp(rd->id, id) != 0) {
652
errno = 0;
653
error("File %s contents are not for dimension %s. Clearing it.", fullfilename, id);
654
// munmap(rd, size);
655
// rd = NULL;
656
- bzero(rd, size);
656
+ memset(rd, 0, size);
657
}
658
}
659