M68K Linux: Define regset structures.

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

diff --git a/gdb/maint.c b/gdb/maint.c
index c7a937c837431b6f64278af0d297b08a13a27cab..7fd2d583977348d2c837bbbdd70020b0df1a5a13 100644 (file)
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -38,7 +38,6 @@
 #include "symfile.h"
 #include "objfiles.h"
 #include "value.h"
-#include "gdb_assert.h"
 #include "top.h"
 #include "timeval-utils.h"
 #include "maint.h"
@@ -236,7 +235,7 @@ match_substring (const char *string, const char *substr)
 }
 
 static int 
-match_bfd_flags (char *string, flagword flags)
+match_bfd_flags (const char *string, flagword flags)
 {
   if (flags & SEC_ALLOC)
     if (match_substring (string, "ALLOC"))
@@ -324,14 +323,15 @@ maint_print_section_info (const char *name, flagword flags,
 static void
 print_bfd_section_info (bfd *abfd, 
                        asection *asect, 
-                       void *arg)
+                       void *datum)
 {
   flagword flags = bfd_get_section_flags (abfd, asect);
   const char *name = bfd_section_name (abfd, asect);
+  const char *arg = datum;
 
-  if (arg == NULL || *((char *) arg) == '\0'
-      || match_substring ((char *) arg, name)
-      || match_bfd_flags ((char *) arg, flags))
+  if (arg == NULL || *arg == '\0'
+      || match_substring (arg, name)
+      || match_bfd_flags (arg, flags))
     {
       struct gdbarch *gdbarch = gdbarch_from_bfd (abfd);
       int addr_size = gdbarch_addr_bit (gdbarch) / 8;
@@ -348,7 +348,7 @@ print_bfd_section_info (bfd *abfd,
 static void
 print_objfile_section_info (bfd *abfd, 
                            struct obj_section *asect, 
-                           char *string)
+                           const char *string)
 {
   flagword flags = bfd_get_section_flags (abfd, asect->the_bfd_section);
   const char *name = bfd_section_name (abfd, asect->the_bfd_section);
@@ -627,7 +627,7 @@ maintenance_do_deprecate (char *text, int deprecate)
   if (alias)
     {
       if (alias->malloced_replacement)
-       xfree (alias->replacement);
+       xfree ((char *) alias->replacement);
 
       if (deprecate)
        {
@@ -646,7 +646,7 @@ maintenance_do_deprecate (char *text, int deprecate)
   else if (cmd)
     {
       if (cmd->malloced_replacement)
-       xfree (cmd->replacement);
+       xfree ((char *) cmd->replacement);
 
       if (deprecate)
        {