Revert the header-sorting patch

[deliverable/binutils-gdb.git] / gdb / frame-base.c

diff --git a/gdb/frame-base.c b/gdb/frame-base.c
index db9547b7721d2c0b736ec916e653a62d36582b30..47897fc653dfdfc2cbc43fffef726818ffe7e0e4 100644 (file)
--- a/gdb/frame-base.c
+++ b/gdb/frame-base.c
@@ -1,7 +1,6 @@
 /* Definitions for frame address handler, for GDB, the GNU debugger.
 
-   Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2003-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -73,6 +72,7 @@ frame_base_init (struct obstack *obstack)
 {
   struct frame_base_table *table
     = OBSTACK_ZALLOC (obstack, struct frame_base_table);
+
   table->tail = &table->head;
   table->default_base = &default_frame_base;
   return table;
@@ -82,8 +82,11 @@ void
 frame_base_append_sniffer (struct gdbarch *gdbarch,
                           frame_base_sniffer_ftype *sniffer)
 {
-  struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
-  (*table->tail) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_base_table_entry);
+  struct frame_base_table *table
+    = (struct frame_base_table *) gdbarch_data (gdbarch, frame_base_data);
+
+  (*table->tail)
+    = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct frame_base_table_entry);
   (*table->tail)->sniffer = sniffer;
   table->tail = &(*table->tail)->next;
 }
@@ -92,7 +95,9 @@ void
 frame_base_set_default (struct gdbarch *gdbarch,
                        const struct frame_base *default_base)
 {
-  struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
+  struct frame_base_table *table
+    = (struct frame_base_table *) gdbarch_data (gdbarch, frame_base_data);
+
   table->default_base = default_base;
 }
 
@@ -100,12 +105,14 @@ const struct frame_base *
 frame_base_find_by_frame (struct frame_info *this_frame)
 {
   struct gdbarch *gdbarch = get_frame_arch (this_frame);
-  struct frame_base_table *table = gdbarch_data (gdbarch, frame_base_data);
+  struct frame_base_table *table
+    = (struct frame_base_table *) gdbarch_data (gdbarch, frame_base_data);
   struct frame_base_table_entry *entry;
 
   for (entry = table->head; entry != NULL; entry = entry->next)
     {
       const struct frame_base *desc = NULL;
+
       desc = entry->sniffer (this_frame);
       if (desc != NULL)
        return desc;
@@ -113,8 +120,6 @@ frame_base_find_by_frame (struct frame_info *this_frame)
   return table->default_base;
 }
 
-extern initialize_file_ftype _initialize_frame_base; /* -Wmissing-prototypes */
-
 void
 _initialize_frame_base (void)
 {