--- dbug.c.orig	2015-07-02 10:33:47.000000000 -0700
+++ dbug.c	2015-07-02 10:36:27.000000000 -0700
@@ -342,7 +342,7 @@
     sstdout->file= stdout;
     sstderr->file= stderr;
     pthread_mutex_init(&THR_LOCK_dbug, NULL);
-    bzero(&init_settings, sizeof(init_settings));
+    memset(&init_settings, 0, sizeof(init_settings));
     init_settings.out_file= sstderr;
     init_settings.flags=OPEN_APPEND;
   }
@@ -352,7 +352,7 @@
   if (!(cs= *cs_ptr))
   {
     cs=(CODE_STATE*) DbugMalloc(sizeof(*cs));
-    bzero((uchar*) cs,sizeof(*cs));
+    memset((uchar *) cs, 0, sizeof(*cs));
     cs->process= db_process ? db_process : "dbug";
     cs->func= "?func";
     cs->file= "?file";
@@ -865,7 +865,7 @@
 void _db_set_init_(const char *control)
 {
   CODE_STATE tmp_cs;
-  bzero((uchar*) &tmp_cs, sizeof(tmp_cs));
+  memset((uchar *) &tmp_cs, 0, sizeof(tmp_cs));
   tmp_cs.stack= &init_settings;
   tmp_cs.process= db_process ? db_process : "dbug";
   DbugParse(&tmp_cs, control);
@@ -1054,7 +1054,7 @@
 int _db_explain_init_(char *buf, size_t len)
 {
   CODE_STATE cs;
-  bzero((uchar*) &cs,sizeof(cs));
+  memset((uchar *) &cs, 0, sizeof(cs));
   cs.stack=&init_settings;
   return _db_explain_(&cs, buf, len);
 }
@@ -1559,7 +1559,7 @@
   struct settings *new_malloc;
 
   new_malloc= (struct settings *) DbugMalloc(sizeof(struct settings));
-  bzero(new_malloc, sizeof(*new_malloc));
+  memset(new_malloc, 0, sizeof(*new_malloc));
   new_malloc->next= cs->stack;
   cs->stack= new_malloc;
 }
@@ -1637,7 +1637,7 @@
   else
   {
     cs= &dummy_cs;
-    bzero(cs, sizeof(*cs));
+    memset(cs, 0, sizeof(*cs));
   }
 
   cs->stack= &init_settings;
