* MAINTAINERS: Move Jim Blandy to past maintainers.

[deliverable/binutils-gdb.git] / gdb / xcoffread.c

diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index a794f61643f7de265c4c623b2a9e663ea0729cd1..0967529e06a9f1673b7faecd855ebf41f2b3ae27 100644 (file)
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -944,7 +944,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
     ((struct coff_symfile_info *) objfile->deprecated_sym_private)->strtbl;
   char *debugsec =
     ((struct coff_symfile_info *) objfile->deprecated_sym_private)->debugsec;
-  char *debugfmt = bfd_xcoff_is_xcoff64 (abfd) ? "XCOFF64" : "XCOFF";
+  const char *debugfmt = bfd_xcoff_is_xcoff64 (abfd) ? "XCOFF64" : "XCOFF";
 
   struct internal_syment symbol[1];
   union internal_auxent main_aux;
@@ -961,7 +961,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
   struct coff_symbol fcn_stab_saved = { 0 };
 
   /* fcn_cs_saved is global because process_xcoff_symbol needs it.  */
-  union internal_auxent fcn_aux_saved;
+  union internal_auxent fcn_aux_saved = main_aux;
   struct context_stack *new;
 
   char *filestring = " _start_ ";      /* Name of the current file.  */
@@ -1585,7 +1585,11 @@ process_xcoff_symbol (struct coff_symbol *cs, struct objfile *objfile)
             where we need to, which is not necessarily super-clean,
             but seems workable enough.  */
 
-         if (*name == ':' || (pp = (char *) strchr (name, ':')) == NULL)
+         if (*name == ':')
+           return NULL;
+
+         pp = strchr (name, ':');
+         if (pp == NULL)
            return NULL;
 
          ++pp;
@@ -2619,7 +2623,7 @@ scan_xcoff_symtab (struct objfile *objfile)
            swap_sym (&symbol, &main_aux[0], &namestring, &sraw_symbol,
                      &ssymnum, objfile);
 
-           p = (char *) strchr (namestring, ':');
+           p = strchr (namestring, ':');
            if (!p)
              continue;                 /* Not a debugging symbol.   */
 
@@ -3084,6 +3088,7 @@ static const struct sym_fns xcoff_sym_fns =
   xcoff_new_init,              /* init anything gbl to entire symtab */
   xcoff_symfile_init,          /* read initial info, setup for sym_read() */
   xcoff_initial_scan,          /* read a symbol file into symtab */
+  NULL,                                /* sym_read_psymbols */
   xcoff_symfile_finish,                /* finished with file, cleanup */
   xcoff_symfile_offsets,       /* xlate offsets ext->int form */
   default_symfile_segments,    /* Get segment information from a file.  */