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 d8abca5..625355e 100644
--- 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 bdffd23..9d9e3da 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -190,7 +190,7 @@
 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 6f455a2..53266a7 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -3715,7 +3715,7 @@
 
   /* 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.  */