Replace deprecated bzero() by memset()

diff --git a/src/proc_net_softnet_stat.c b/src/proc_net_softnet_stat.c
index 4fb710d8c638fddf4311c38a801094417a2e3ef0..007d97938f65fabed9430a3657d889e5b4834da0 100644 (file)
--- a/src/proc_net_softnet_stat.c
+++ b/src/proc_net_softnet_stat.c
@@ -41,16 +41,16 @@ int do_proc_net_softnet_stat(int update_every, unsigned long long dt) {
 
     if(lines > 200) lines = 200;
     if(words > 50) words = 50;
-    
+
     if(unlikely(!data || lines > allocated_lines || words > allocated_columns)) {
         freez(data);
         allocated_lines = lines;
         allocated_columns = words;
         data = mallocz((allocated_lines + 1) * allocated_columns * sizeof(uint32_t));
     }
-    
+
     // initialize to zero
-    bzero(data, (allocated_lines + 1) * allocated_columns * sizeof(uint32_t));
+    memset(data, 0, (allocated_lines + 1) * allocated_columns * sizeof(uint32_t));
 
     // parse the values
     for(l = 0; l < lines ;l++) {

diff --git a/src/rrd.c b/src/rrd.c
index 2b70e72a724d00a4e377282d26a6d391896fdac7..59b0c9988a9354ed85a116581dce4d2b3a9ab455 100644 (file)
--- a/src/rrd.c
+++ b/src/rrd.c
@@ -422,7 +422,7 @@ void rrdset_reset(RRDSET *st)
         rd->last_collected_time.tv_sec = 0;
         rd->last_collected_time.tv_usec = 0;
         rd->counter = 0;
-        bzero(rd->values, rd->entries * sizeof(storage_number));
+        memset(rd->values, 0, rd->entries * sizeof(storage_number));
     }
 }
 
@@ -468,29 +468,29 @@ RRDSET *rrdset_create(const char *type, const char *id, const char *name, const
         if(strcmp(st->magic, RRDSET_MAGIC) != 0) {
             errno = 0;
             info("Initializing file %s.", fullfilename);
-            bzero(st, size);
+            memset(st, 0, size);
         }
         else if(strcmp(st->id, fullid) != 0) {
             errno = 0;
             error("File %s contents are not for chart %s. Clearing it.", fullfilename, fullid);
             // munmap(st, size);
             // st = NULL;
-            bzero(st, size);
+            memset(st, 0, size);
         }
         else if(st->memsize != size || st->entries != entries) {
             errno = 0;
             error("File %s does not have the desired size. Clearing it.", fullfilename);
-            bzero(st, size);
+            memset(st, 0, size);
         }
         else if(st->update_every != update_every) {
             errno = 0;
             error("File %s does not have the desired update frequency. Clearing it.", fullfilename);
-            bzero(st, size);
+            memset(st, 0, size);
         }
         else if((time(NULL) - st->last_updated.tv_sec) > update_every * entries) {
             errno = 0;
             error("File %s is too old. Clearing it.", fullfilename);
-            bzero(st, size);
+            memset(st, 0, size);
         }
     }
 
@@ -616,44 +616,44 @@ RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier
         if(strcmp(rd->magic, RRDDIMENSION_MAGIC) != 0) {
             errno = 0;
             info("Initializing file %s.", fullfilename);
-            bzero(rd, size);
+            memset(rd, 0, size);
         }
         else if(rd->memsize != size) {
             errno = 0;
             error("File %s does not have the desired size. Clearing it.", fullfilename);
-            bzero(rd, size);
+            memset(rd, 0, size);
         }
         else if(rd->multiplier != multiplier) {
             errno = 0;
             error("File %s does not have the same multiplier. Clearing it.", fullfilename);
-            bzero(rd, size);
+            memset(rd, 0, size);
         }
         else if(rd->divisor != divisor) {
             errno = 0;
             error("File %s does not have the same divisor. Clearing it.", fullfilename);
-            bzero(rd, size);
+            memset(rd, 0, size);
         }
         else if(rd->algorithm != algorithm) {
             errno = 0;
             error("File %s does not have the same algorithm. Clearing it.", fullfilename);
-            bzero(rd, size);
+            memset(rd, 0, size);
         }
         else if(rd->update_every != st->update_every) {
             errno = 0;
             error("File %s does not have the same refresh frequency. Clearing it.", fullfilename);
-            bzero(rd, size);
+            memset(rd, 0, size);
         }
         else if(usec_dt(&now, &rd->last_collected_time) > (rd->entries * rd->update_every * 1000000ULL)) {
             errno = 0;
             error("File %s is too old. Clearing it.", fullfilename);
-            bzero(rd, size);
+            memset(rd, 0, size);
         }
         else if(strcmp(rd->id, id) != 0) {
             errno = 0;
             error("File %s contents are not for dimension %s. Clearing it.", fullfilename, id);
             // munmap(rd, size);
             // rd = NULL;
-            bzero(rd, size);
+            memset(rd, 0, size);
         }
     }