bzero -> memset

20 files changed, 69 insertions, 58 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0cb8531bb1..85f241d164 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,15 @@
-Wed Sep  1 14:41:28 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
+Wed Sep  1 14:36:00 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* arm-tdep.c, convex-tdep.c, convex-xdep.c, dbxread.c,
+	  h8300-tdep.c, h8500-tdep.c, i960-pinsn.c, i960-tdep.c,
+	  infptrace.c, m88k-tdep.c, mips-tdep.c, regex.c, remote-vx.c,
+	  rs6000-tdep.c, xcoffexec.c, xcoffread.c, z8k-tdep.c,
+	  config/arm/tm-arm.h, config/convex/tm-convex.h,
+	  config/gould/tm-np1.h, config/gould/tm-pn.h,
+	  config/m68k/tm-isi.h, config/ns32k/tm-umax.h,
+	  config/pa/tm-hppa.h, config/pyr/tm-pyr.h,
+	  config/rs6000/tm-rs6000.h, config/tahoe/tm-tahoe.h,
+	  config/vax/tm-vax.h:  bzero -> memset.
 
 	* regex.c: bcmp -> memcmp.
 
@@ -37,7 +48,7 @@ Wed Sep  1 13:12:43 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 	  config/pa/tm-hppa.h, config/pyr/tm-pyr.h,
 	  config/rs6000/tm-rs6000.h, config/sh/tm-sh.h,
 	  config/tahoe/tm-tahoe.h, config/vax/tm-vax.h,
-	  config/z8k/tm-z8k.h, nindy-share/nindy.c: bcopy -> memcpy
+	  config/z8k/tm-z8k.h, nindy-share/nindy.c: bcopy -> memcpy.
 
 Wed Sep  1 05:05:53 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
diff --git a/gdb/config/m68k/tm-isi.h b/gdb/config/m68k/tm-isi.h
index 19a099acdd..e57f3048c8 100644
--- a/gdb/config/m68k/tm-isi.h
+++ b/gdb/config/m68k/tm-isi.h
@@ -69,7 +69,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
   register CORE_ADDR pc;						\
   register int insn;							\
   register int offset;							\
-  bzero (&frame_saved_regs, sizeof frame_saved_regs);			\
+  memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);			\
   if ((frame_info)->pc >= (frame_info)->frame - CALL_DUMMY_LENGTH - FP_REGNUM*4 - 8*12 - 4 \
       && (frame_info)->pc <= (frame_info)->frame)				\
     { next_addr = (frame_info)->frame;					\
diff --git a/gdb/config/ns32k/tm-umax.h b/gdb/config/ns32k/tm-umax.h
index b4e13ee93c..ded8252fa3 100644
--- a/gdb/config/ns32k/tm-umax.h
+++ b/gdb/config/ns32k/tm-umax.h
@@ -295,7 +295,7 @@ extern CORE_ADDR ns32k_get_enter_addr ();
   register CORE_ADDR	enter_addr;				\
   register CORE_ADDR	next_addr;				\
 								\
-  bzero (&(frame_saved_regs), sizeof (frame_saved_regs));	\
+  memset (&(frame_saved_regs), '\0', sizeof (frame_saved_regs));	\
   enter_addr = ns32k_get_enter_addr ((frame_info)->pc);		\
   if (enter_addr > 1)						\
     {								\
diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index 55e577412f..3dd646dd7f 100644
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -351,7 +351,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
   unsigned this_insn;							\
   unsigned address;							\
 									\
-  bzero (&frame_saved_regs, sizeof frame_saved_regs);			\
+  memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);			\
   if ((frame_info->pc >= (frame_info)->frame                            \
        && (frame_info)->pc <= ((frame_info)->frame + CALL_DUMMY_LENGTH  \
 			       + 32 * 4 + (NUM_REGS - FP0_REGNUM) * 8   \
diff --git a/gdb/config/vax/tm-vax.h b/gdb/config/vax/tm-vax.h
index 2fbaff58d0..ddf0dcf717 100644
--- a/gdb/config/vax/tm-vax.h
+++ b/gdb/config/vax/tm-vax.h
@@ -267,7 +267,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 { register int regnum;     \
   register int regmask = read_memory_integer ((frame_info)->frame+4, 4) >> 16; \
   register CORE_ADDR next_addr;     \
-  bzero (&frame_saved_regs, sizeof frame_saved_regs);     \
+  memset (&frame_saved_regs, '\0', sizeof frame_saved_regs);     \
   next_addr = (frame_info)->frame + 16;     \
   /* Regmask's low bit is for register 0,     \
      which is the first one that would be pushed.  */     \
diff --git a/gdb/convex-tdep.c b/gdb/convex-tdep.c
index 23f711363e..dd4daeb9f3 100644
--- a/gdb/convex-tdep.c
+++ b/gdb/convex-tdep.c
@@ -223,7 +223,7 @@ xfer_core_file (memaddr, myaddr, len)
 	 read zeros if reading, or do nothing if writing.  */
       else
 	{
-	  bzero (myaddr, i);
+	  memset (myaddr, '\0', i);
 	  returnval = EIO;
 	}
 
diff --git a/gdb/convex-xdep.c b/gdb/convex-xdep.c
index 84bddd2cd8..ee70f9f2aa 100644
--- a/gdb/convex-xdep.c
+++ b/gdb/convex-xdep.c
@@ -282,7 +282,7 @@ read_inferior_memory (memaddr, myaddr, len)
       len -= i;
     }
   if (errno) 
-    bzero (myaddr, len);
+    memset (myaddr, '\0', len);
   return errno;
 }
 
@@ -391,7 +391,7 @@ read_vector_register (reg)
       ps.pi_thread = inferior_thread;
       ioctl (inferior_fd, PIXRDVREGS, &ps);
       if (errno)
-	bzero (&vector_registers, sizeof vector_registers);
+	memset (&vector_registers, '\0', sizeof vector_registers);
     }
   else if (corechan >= 0)
     {
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 0ea268720b..42bd4b4ced 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -407,8 +407,8 @@ explicit_lookup_type (real_filenum, index)
       f->length *= 2;
       f->vector = (struct type **)
 	xrealloc (f->vector, f->length * sizeof (struct type *));
-      bzero (&f->vector[f->length / 2],
-	     f->length * sizeof (struct type *) / 2);
+      memset (&f->vector[f->length / 2],
+	     '\0', f->length * sizeof (struct type *) / 2);
     }
   return &f->vector[index];
 }
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 3bc5b36185..a50e4bd378 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -153,7 +153,7 @@ frame_find_saved_regs (fi, fsr)
       cache_fsr = (struct frame_saved_regs *)
 	obstack_alloc (&frame_cache_obstack,
 		       sizeof (struct frame_saved_regs));
-      bzero (cache_fsr, sizeof (struct frame_saved_regs));
+      memset (cache_fsr, '\0', sizeof (struct frame_saved_regs));
 
       fi->fsr = cache_fsr;
 
diff --git a/gdb/h8500-tdep.c b/gdb/h8500-tdep.c
index aa38226ec4..dcf80a0ade 100644
--- a/gdb/h8500-tdep.c
+++ b/gdb/h8500-tdep.c
@@ -164,7 +164,7 @@ frame_find_saved_regs (fi, fsr)
       cache_fsr = (struct frame_saved_regs *)
 	obstack_alloc (&frame_cache_obstack,
 		       sizeof (struct frame_saved_regs));
-      bzero (cache_fsr, sizeof (struct frame_saved_regs));
+      memset (cache_fsr, '\0', sizeof (struct frame_saved_regs));
 
       fi->fsr = cache_fsr;
 
@@ -485,7 +485,7 @@ frame_find_saved_regs (frame_info, frame_saved_regs)
   register CORE_ADDR pc;
   unsigned char thebyte;
 
-  bzero (frame_saved_regs, sizeof *frame_saved_regs);
+  memset (frame_saved_regs, '\0', sizeof *frame_saved_regs);
 
   if ((frame_info)->pc >= (frame_info)->frame - CALL_DUMMY_LENGTH - FP_REGNUM * 4 - 4
       && (frame_info)->pc <= (frame_info)->frame)
diff --git a/gdb/i960-pinsn.c b/gdb/i960-pinsn.c
index 941a45c080..81fd8b27b8 100644
--- a/gdb/i960-pinsn.c
+++ b/gdb/i960-pinsn.c
@@ -99,7 +99,7 @@ mem( memaddr, word1, word2, noprint )
 
 	if ( mem_tab == NULL ){
 		mem_tab = (struct tabent *) xmalloc( MEM_SIZ );
-		bzero( mem_tab, MEM_SIZ );
+		memset( mem_tab, '\0', MEM_SIZ );
 		for ( i = 0; mem_init[i].opcode != 0; i++ ){
 			j = mem_init[i].opcode - MEM_MIN;
 			mem_tab[j].name = mem_init[i].name;
diff --git a/gdb/i960-tdep.c b/gdb/i960-tdep.c
index 0fb444863d..3f46f394bc 100644
--- a/gdb/i960-tdep.c
+++ b/gdb/i960-tdep.c
@@ -336,7 +336,7 @@ frame_find_saved_regs (fi, fsr)
       cache_fsr = (struct frame_saved_regs *)
 		  obstack_alloc (&frame_cache_obstack,
 				 sizeof (struct frame_saved_regs));
-      bzero (cache_fsr, sizeof (struct frame_saved_regs));
+      memset (cache_fsr, '\0', sizeof (struct frame_saved_regs));
       fi->fsr = cache_fsr;
 
       /* Find the start and end of the function prologue.  If the PC
diff --git a/gdb/m88k-tdep.c b/gdb/m88k-tdep.c
index 62f7f060bb..952488c0cd 100644
--- a/gdb/m88k-tdep.c
+++ b/gdb/m88k-tdep.c
@@ -217,7 +217,7 @@ examine_prologue (ip, limit, frame_sp, fsr, fi)
   int fp_offset = -1;		/* -1 means not set */
   CORE_ADDR frame_fp;
 
-  bzero (must_adjust, sizeof (must_adjust));
+  memset (must_adjust, '\0', sizeof (must_adjust));
   next_ip = NEXT_PROLOGUE_INSN (ip, limit, &insn);
 
   /* Accept move of incoming registers to other registers, using
@@ -479,7 +479,7 @@ frame_find_saved_regs (fi, fsr)
       cache_fsr = (struct frame_saved_regs *)
 		  obstack_alloc (&frame_cache_obstack,
 				 sizeof (struct frame_saved_regs));
-      bzero (cache_fsr, sizeof (struct frame_saved_regs));
+      memset (cache_fsr, '\0', sizeof (struct frame_saved_regs));
       fi->fsr = cache_fsr;
 
       /* Find the start and end of the function prologue.  If the PC
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index f437abe949..d2d712aff7 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -187,8 +187,8 @@ heuristic_proc_desc(start_pc, limit_pc, next_frame)
     unsigned long reg_mask = 0;
 
     if (start_pc == 0) return NULL;
-    bzero(&temp_proc_desc, sizeof(temp_proc_desc));
-    bzero(&temp_saved_regs, sizeof(struct frame_saved_regs));
+    memset(&temp_proc_desc, '\0', sizeof(temp_proc_desc));
+    memset(&temp_saved_regs, '\0', sizeof(struct frame_saved_regs));
     PROC_LOW_ADDR(&temp_proc_desc) = start_pc;
 
     if (start_pc + 200 < limit_pc) limit_pc = start_pc + 200;
diff --git a/gdb/regex.c b/gdb/regex.c
index 21436d36bc..75bf4e9fc2 100644
--- a/gdb/regex.c
+++ b/gdb/regex.c
@@ -68,7 +68,7 @@ init_syntax_once ()
    if (done)
      return;
 
-   bzero (re_syntax_table, sizeof re_syntax_table);
+   memset (re_syntax_table, '\0', sizeof re_syntax_table);
 
    for (c = 'a'; c <= 'z'; c++)
      re_syntax_table[c] = Sword;
@@ -404,7 +404,7 @@ re_compile_pattern (pattern, size, bufp)
 
 	  PATPUSH ((1 << BYTEWIDTH) / BYTEWIDTH);
 	  /* Clear the whole map */
-	  bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH);
+	  memset (b, '\0', (1 << BYTEWIDTH) / BYTEWIDTH);
 	  /* Read in characters and ranges, setting map bits */
 	  while (1)
 	    {
@@ -705,7 +705,7 @@ re_compile_fastmap (bufp)
   unsigned char *stackb[NFAILURES];
   unsigned char **stackp = stackb;
 
-  bzero (fastmap, (1 << BYTEWIDTH));
+  memset (fastmap, '\0', (1 << BYTEWIDTH));
   bufp->fastmap_accurate = 1;
   bufp->can_be_null = 0;
       
diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 6824f80d4c..d4d5f9e9bf 100644
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -101,7 +101,7 @@ net_load (filename, pTextAddr, pDataAddr, pBssAddr)
     struct ldfile ldstruct;
     struct timeval load_timeout;
  
-    bzero ((char *) &ldstruct, sizeof (ldstruct));
+    memset ((char *) &ldstruct, '\0', sizeof (ldstruct));
 
     /* We invoke clnt_call () here directly, instead of through
        net_clnt_call (), because we need to set a large timeout value.
@@ -143,7 +143,7 @@ net_break (addr, procnum)
     Rptrace ptrace_in;  /* XXX This is stupid.  It doesn't need to be a ptrace
                            structure.  How about something smaller? */
 
-    bzero ((char *) &ptrace_in, sizeof (ptrace_in));
+    memset ((char *) &ptrace_in, '\0', sizeof (ptrace_in));
     break_status = 0;
 
     ptrace_in.addr = addr;
@@ -195,8 +195,8 @@ vx_create_inferior (exec_file, args, env)
   arg_array passArgs;
   TASK_START taskStart;
 
-  bzero ((char *) &passArgs, sizeof (passArgs));
-  bzero ((char *) &taskStart, sizeof (taskStart));
+  memset ((char *) &passArgs, '\0', sizeof (passArgs));
+  memset ((char *) &taskStart, '\0', sizeof (taskStart));
 
   /* parse arguments, put them in passArgs */
 
@@ -254,7 +254,7 @@ parse_args (arg_string, arg_struct)
   register int arg_index = 0;
   register char *p0;
  
-  bzero ((char *) arg_struct, sizeof (arg_array));
+  memset ((char *) arg_struct, '\0', sizeof (arg_array));
  
   /* first count how many arguments there are */
 
@@ -334,7 +334,7 @@ net_wait (pEvent)
     int pid;
     enum clnt_stat status;
 
-    bzero ((char *) pEvent, sizeof (RDB_EVENT));
+    memset ((char *) pEvent, '\0', sizeof (RDB_EVENT));
 
     pid = inferior_pid;
     status = net_clnt_call (PROCESS_WAIT, xdr_int, &pid, xdr_RDB_EVENT, pEvent);
@@ -378,8 +378,8 @@ vx_read_register (regno)
   C_bytes out_data;
   extern char registers[];
 
-  bzero ((char *) &ptrace_in, sizeof (ptrace_in));
-  bzero ((char *) &ptrace_out, sizeof (ptrace_out));
+  memset ((char *) &ptrace_in, '\0', sizeof (ptrace_in));
+  memset ((char *) &ptrace_out, '\0', sizeof (ptrace_out));
 
   /* FIXME, eventually only get the ones we need.  */
   registers_fetched ();
@@ -422,7 +422,7 @@ vx_read_register (regno)
     }
   else
     {
-      bzero (&registers[REGISTER_BYTE (FP0_REGNUM)], VX_SIZE_FPREGS);
+      memset (&registers[REGISTER_BYTE (FP0_REGNUM)], '\0', VX_SIZE_FPREGS);
     }
 #endif /* VX_SIZE_FPREGS */
 }
@@ -454,8 +454,8 @@ vx_write_register (regno)
   Rptrace ptrace_in;
   Ptrace_return ptrace_out;
 
-  bzero ((char *) &ptrace_in, sizeof (ptrace_in));
-  bzero ((char *) &ptrace_out, sizeof (ptrace_out));
+  memset ((char *) &ptrace_in, '\0', sizeof (ptrace_in));
+  memset ((char *) &ptrace_out, '\0', sizeof (ptrace_out));
 
   ptrace_in.pid = inferior_pid;
   ptrace_in.info.ttype     = DATA;
@@ -521,8 +521,8 @@ vx_xfer_memory (memaddr, myaddr, len, write, target)
   Ptrace_return ptrace_out;
   C_bytes data;
 
-  bzero ((char *) &ptrace_in, sizeof (ptrace_in));
-  bzero ((char *) &ptrace_out, sizeof (ptrace_out));
+  memset ((char *) &ptrace_in, '\0', sizeof (ptrace_in));
+  memset ((char *) &ptrace_out, '\0', sizeof (ptrace_out));
 
   ptrace_in.pid = inferior_pid;		/* XXX pid unnecessary for READDATA */
   ptrace_in.addr = (int) memaddr;	/* Where from */
@@ -590,8 +590,8 @@ vx_resume (pid, step, siggnal)
   if (siggnal != 0 && siggnal != stop_signal)
     error ("Cannot send signals to VxWorks processes");
 
-  bzero ((char *) &ptrace_in, sizeof (ptrace_in));
-  bzero ((char *) &ptrace_out, sizeof (ptrace_out));
+  memset ((char *) &ptrace_in, '\0', sizeof (ptrace_in));
+  memset ((char *) &ptrace_out, '\0', sizeof (ptrace_out));
 
   ptrace_in.pid = pid;
   ptrace_in.addr = 1;	/* Target side insists on this, or it panics.  */
@@ -728,7 +728,7 @@ net_get_symbols (pLoadTable)
 {
   enum clnt_stat status;
 
-  bzero ((char *) pLoadTable, sizeof (struct ldtabl));
+  memset ((char *) pLoadTable, '\0', sizeof (struct ldtabl));
 
   status = net_clnt_call (VX_STATE_INQ, xdr_void, 0, xdr_ldtabl, pLoadTable);
   return (status == RPC_SUCCESS) ? 0 : -1;
@@ -750,7 +750,7 @@ vx_lookup_symbol (name, pAddr)
   SYMBOL_ADDR symbolAddr;
 
   *pAddr = 0;
-  bzero ((char *) &symbolAddr, sizeof (symbolAddr));
+  memset ((char *) &symbolAddr, '\0', sizeof (symbolAddr));
 
   status = net_clnt_call (VX_SYMBOL_INQ, xdr_wrapstring, &name,
 			  xdr_SYMBOL_ADDR, &symbolAddr);
@@ -803,7 +803,7 @@ net_connect (host)
       addr = * (unsigned long *) destHost->h_addr;
     }
 
-  bzero (&destAddr, sizeof (destAddr));
+  memset (&destAddr, '\0', sizeof (destAddr));
 
   destAddr.sin_addr.s_addr = addr;
   destAddr.sin_family      = AF_INET;
@@ -1104,8 +1104,8 @@ vx_attach (args, from_tty)
   if (from_tty)
       printf ("Attaching pid %s.\n", local_hex_string(pid));
 
-  bzero ((char *)&ptrace_in,  sizeof (ptrace_in));
-  bzero ((char *)&ptrace_out, sizeof (ptrace_out));
+  memset ((char *)&ptrace_in,  '\0', sizeof (ptrace_in));
+  memset ((char *)&ptrace_out, '\0', sizeof (ptrace_out));
   ptrace_in.pid = pid;
 
   status = net_ptrace_clnt_call (PTRACE_ATTACH, &ptrace_in, &ptrace_out);
@@ -1152,8 +1152,8 @@ vx_detach (args, from_tty)
   if (args)		/* FIXME, should be possible to leave suspended */
     signal = atoi (args);
   
-  bzero ((char *)&ptrace_in,  sizeof (ptrace_in));
-  bzero ((char *)&ptrace_out, sizeof (ptrace_out));
+  memset ((char *)&ptrace_in,  '\0', sizeof (ptrace_in));
+  memset ((char *)&ptrace_out, '\0', sizeof (ptrace_out));
   ptrace_in.pid = inferior_pid;
 
   status = net_ptrace_clnt_call (PTRACE_DETACH, &ptrace_in, &ptrace_out);
@@ -1180,8 +1180,8 @@ vx_kill ()
 
   printf ("Killing pid %s.\n", local_hex_string(inferior_pid));
 
-  bzero ((char *)&ptrace_in,  sizeof (ptrace_in));
-  bzero ((char *)&ptrace_out, sizeof (ptrace_out));
+  memset ((char *)&ptrace_in,  '\0', sizeof (ptrace_in));
+  memset ((char *)&ptrace_out, '\0', sizeof (ptrace_out));
   ptrace_in.pid = inferior_pid;
 
   status = net_ptrace_clnt_call (PTRACE_KILL, &ptrace_in, &ptrace_out);
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 03fbdb39fd..3198fc6b60 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -987,7 +987,7 @@ frame_get_cache_fsr (fi, fdatap)
 
   fi->cache_fsr = (struct frame_saved_regs *)
       obstack_alloc (&frame_cache_obstack, sizeof (struct frame_saved_regs));
-  bzero (fi->cache_fsr, sizeof (struct frame_saved_regs));
+  memset (fi->cache_fsr, '\0', sizeof (struct frame_saved_regs));
 
   if (fi->prev && fi->prev->frame)
     frame_addr = fi->prev->frame;
diff --git a/gdb/xcoffexec.c b/gdb/xcoffexec.c
index 9ede8493ea..474bfbd515 100644
--- a/gdb/xcoffexec.c
+++ b/gdb/xcoffexec.c
@@ -290,7 +290,7 @@ map_vmap (bfd *bf, bfd *arch)
   struct objfile *obj;
 
   vp = (void*) xmalloc (sizeof (*vp));
-  bzero (vp, sizeof (*vp));
+  memset (vp, '\0', sizeof (*vp));
   vp->nxt = 0;
   vp->bfd = bf;
   vp->name = bfd_get_filename(arch ? arch : bf);
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 4abaee9a35..960d2d894a 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -426,7 +426,7 @@ struct coff_symbol *cs;
   if (inclLength == 0) {
     inclTable = (InclTable*) 
 	xmalloc (sizeof (InclTable) * INITIAL_INCLUDE_TABLE_LENGTH);
-    bzero (inclTable, sizeof (InclTable) * INITIAL_INCLUDE_TABLE_LENGTH);
+    memset (inclTable, '\0', sizeof (InclTable) * INITIAL_INCLUDE_TABLE_LENGTH);
     inclLength = INITIAL_INCLUDE_TABLE_LENGTH;
     inclIndx = 0;
   }
@@ -434,8 +434,8 @@ struct coff_symbol *cs;
     inclLength += INITIAL_INCLUDE_TABLE_LENGTH;
     inclTable = (InclTable*) 
 	xrealloc (inclTable, sizeof (InclTable) * inclLength);
-    bzero (inclTable+inclLength-INITIAL_INCLUDE_TABLE_LENGTH, 
-			sizeof (InclTable)*INITIAL_INCLUDE_TABLE_LENGTH);
+    memset (inclTable+inclLength-INITIAL_INCLUDE_TABLE_LENGTH, 
+			'\0', sizeof (InclTable)*INITIAL_INCLUDE_TABLE_LENGTH);
   }
 
   inclTable [inclIndx].name  = cs->c_name;
@@ -490,7 +490,7 @@ process_linenos (start, end)
   if (!(offset = first_fun_line_offset))
     goto return_after_cleanup;
 
-  bzero (&main_subfile, sizeof (main_subfile));
+  memset (&main_subfile, '\0', sizeof (main_subfile));
   first_fun_line_offset = 0;
 
   if (inclIndx == 0)
@@ -519,7 +519,7 @@ process_linenos (start, end)
       tmpSubfile = inclTable[ii].subfile = (struct subfile*) 
       				xmalloc (sizeof (struct subfile));
 
-      bzero (tmpSubfile, sizeof (struct subfile));
+      memset (tmpSubfile, '\0', sizeof (struct subfile));
       firstLine = &(inclTable[ii].funStartLine);
 
       /* enter include file's lines now. */
@@ -619,7 +619,7 @@ return_after_cleanup:
   inclIndx = 0;
 
   /* start with a fresh subfile structure for the next file. */
-  bzero (&main_subfile, sizeof (struct subfile));
+  memset (&main_subfile, '\0', sizeof (struct subfile));
 }
 
 void
@@ -717,7 +717,7 @@ retrieve_tracebackinfo (abfd, textsec, cs)
 
   int functionstart = cs->c_value - textsec->vma;
 
-  bzero (&tbInfo, sizeof (tbInfo));
+  memset (&tbInfo, '\0', sizeof (tbInfo));
 
   /* keep reading blocks of data from the text section, until finding a zero
      word and a traceback table. */
@@ -1557,7 +1557,7 @@ process_xcoff_symbol (cs, objfile)
   if (name[0] == '.')
     ++name;
 
-  bzero (sym, sizeof (struct symbol));
+  memset (sym, '\0', sizeof (struct symbol));
 
   /* default assumptions */
   SYMBOL_VALUE (sym) = cs->c_value;
diff --git a/gdb/z8k-tdep.c b/gdb/z8k-tdep.c
index 6289ac6951..eb596bb595 100644
--- a/gdb/z8k-tdep.c
+++ b/gdb/z8k-tdep.c
@@ -189,7 +189,7 @@ get_frame_saved_regs (frame_info, frame_saved_regs)
   CORE_ADDR pc;
   int w;
 
-  bzero (frame_saved_regs, sizeof (*frame_saved_regs));
+  memset (frame_saved_regs, '\0', sizeof (*frame_saved_regs));
   pc = get_pc_function_start (frame_info->pc);
 
 /* wander down the instruction stream */