undefined newexpr->gdbarch field in ada-lang.c:replace_operator_with_call

[deliverable/binutils-gdb.git] / gdb / linux-fork.c

diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 6a80f574b6af60928913b28203809484d1a3eab7..7f654afedd6718e539124281a05bce7df61d84b5 100644 (file)
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -49,7 +49,7 @@ struct fork_info
   struct fork_info *next;
   ptid_t ptid;
   ptid_t parent_ptid;
-  int num;                     /* Convenient handle (GDB fork id) */
+  int num;                     /* Convenient handle (GDB fork id).  */
   struct regcache *savedregs;  /* Convenient for info fork, saves
                                   having to actually switch contexts.  */
   int clobber_regs;            /* True if we should restore saved regs.  */
@@ -419,7 +419,7 @@ inferior_call_waitpid_cleanup (void *fp)
 
   if (oldfp)
     {
-      /* Switch back to inferior_ptid. */
+      /* Switch back to inferior_ptid.  */
       remove_breakpoints ();
       fork_load_infrun_state (oldfp);
       insert_breakpoints ();
@@ -443,7 +443,7 @@ inferior_call_waitpid (ptid_t pptid, int pid)
       oldfp = find_fork_ptid (inferior_ptid);
       gdb_assert (oldfp != NULL);
       newfp = find_fork_ptid (pptid);
-      gdb_assert (oldfp != NULL);
+      gdb_assert (newfp != NULL);
       fork_save_infrun_state (oldfp, 1);
       remove_breakpoints ();
       fork_load_infrun_state (newfp);
@@ -584,14 +584,7 @@ info_checkpoints_command (char *arg, int from_tty)
 
       sal = find_pc_line (pc, 0);
       if (sal.symtab)
-       {
-         char *tmp = strrchr (sal.symtab->filename, '/');
-
-         if (tmp)
-           printf_filtered (_(", file %s"), tmp + 1);
-         else
-           printf_filtered (_(", file %s"), sal.symtab->filename);
-       }
+       printf_filtered (_(", file %s"), lbasename (sal.symtab->filename));
       if (sal.line)
        printf_filtered (_(", line %d"), sal.line);
       if (!sal.symtab && !sal.line)