Use standard memset rather than Berkeley bzero().

diff --git a/game.c b/game.c
index 0a73e2abfcc80d00bd5d93422649b0699a4aac64..913dc415dab67af1589b4d319d23143682bc9bca 100644 (file)
--- a/game.c
+++ b/game.c
@@ -805,7 +805,7 @@ void stat_display(char *mbuf, int round)
     int user_cost, comp_cost;
     char *p;
        
-    (void) bzero ((char *)counts, sizeof (counts));
+    (void) memset ((char *)counts, '\0', sizeof (counts));
        
     for (i = 0; i < MAP_SIZE; i++) {
        p = strchr (pieces, mbuf[i]);

diff --git a/map.c b/map.c
index e8362195c025083b3aa4c2e9e7ad72443b61d6fb..d0a539b0acb955657d5d2f7dadda34c468995934 100644 (file)
--- a/map.c
+++ b/map.c
@@ -51,8 +51,8 @@ or lakes.
 void
 vmap_cont (int *cont_map, view_map_t *vmap, loc_t loc, char bad_terrain)
 {
-       (void) bzero ((char *)cont_map, MAP_SIZE * sizeof (int));
-       vmap_mark_up_cont (cont_map, vmap, loc, bad_terrain);
+    (void) memset ((char *)cont_map, '\0', MAP_SIZE * sizeof (int));
+    vmap_mark_up_cont (cont_map, vmap, loc, bad_terrain);
 }
 
 /*
@@ -116,7 +116,7 @@ static void rmap_mark_up_cont(int *cont_map, loc_t loc, char bad_terrain);
 void
 rmap_cont(int *cont_map, loc_t loc, char bad_terrain)
 {
-    (void) bzero ((char *)cont_map, MAP_SIZE * sizeof (int));
+    (void) memset ((char *)cont_map, '\0', MAP_SIZE * sizeof (int));
     rmap_mark_up_cont (cont_map, loc, bad_terrain);
 }
 
@@ -158,7 +158,7 @@ vmap_cont_scan(int *cont_map, view_map_t *vmap)
     scan_counts_t counts;
     count_t i;
 
-    (void) bzero ((char *)&counts, sizeof (scan_counts_t));
+    (void) memset ((char *)&counts, '\0', sizeof (scan_counts_t));
        
     for (i = 0; i < MAP_SIZE; i++) {
        if (cont_map[i]) { /* cell on continent? */
@@ -212,7 +212,7 @@ rmap_cont_scan(int *cont_map)
     scan_counts_t counts;
     count_t i;
 
-    (void) bzero ((char *)&counts, sizeof (scan_counts_t));
+    (void) memset ((char *)&counts, '\0', sizeof (scan_counts_t));
        
     for (i = 0; i < MAP_SIZE; i++) {
        if (cont_map[i]) { /* cell on continent? */
@@ -694,7 +694,7 @@ vmap_prune_explore_locs(view_map_t *vmap)
     count_t i;
     long copied;
 
-    (void) bzero (pmap, sizeof (pmap));
+    (void) memset (pmap, '\0', sizeof (pmap));
     from = &p1;
     to = &p2;
     from->len = 0;
@@ -955,7 +955,7 @@ vmap_mark_near_path(path_map_t path_map[], loc_t loc)
     loc_t new_loc, xloc;
     int hit_loc[8];
 
-    (void) bzero ((char *)hit_loc, sizeof(int)*8);
+    (void) memset ((char *)hit_loc, '\0', sizeof(int)*8);
        
     FOR_ADJ_ON (loc, new_loc, i) {
        FOR_ADJ_ON (new_loc, xloc, j)