2010-02-18 Harald Koenig <H.Koenig@science-computing.de>

	* mi/mi-main.c (mi_cmd_exec_jump): Drop unneeded `return'.
	* symfile.c (symfile_map_offsets_to_segments): Fix assertion.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8abca5593f989807e326f3821c87aec736cd9d4..625355ea6e79c5a874ae569a9ed6153cc850146e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-18  Harald Koenig  <H.Koenig@science-computing.de>
+
+       * mi/mi-main.c (mi_cmd_exec_jump): Drop unneeded `return'.
+       * symfile.c (symfile_map_offsets_to_segments): Fix assertion.
+
 2010-02-17  Tom Tromey  <tromey@redhat.com>
 
        * NEWS: Add Python API Improvements section.

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index bdffd2313f94a17ae15ab6c97ba6cfd8c36d058c..9d9e3da2d8341de503200b30c1620a1032842d27 100644 (file)
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -190,7 +190,7 @@ void
 mi_cmd_exec_jump (char *args, char **argv, int argc)
 {
   /* FIXME: Should call a libgdb function, not a cli wrapper.  */
-  return mi_execute_async_cli_command ("jump", argv, argc);
+  mi_execute_async_cli_command ("jump", argv, argc);
 }
  
 static int

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 6f455a21865acb1a892e0a60215e3c4f982f49dd..53266a78c5fa9d850ce387fc1f0a672441fc56a9 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -3715,7 +3715,7 @@ symfile_map_offsets_to_segments (bfd *abfd, struct symfile_segment_data *data,
 
   /* It doesn't make sense to call this function unless you have some
      segment base addresses.  */
-  gdb_assert (segment_bases > 0);
+  gdb_assert (num_segment_bases > 0);
 
   /* If we do not have segment mappings for the object file, we
      can not relocate it by segments.  */