[Patch]: Minor formatting clean-ups in breakpoint.c

[Michael Snyder <msnyder at cygnus dot com>]

Prettification only.
2001-02-28  Michael Snyder  <msnyder@mvstp600e.cygnus.com>

	* breakpoint.c (print_one_breakpoint): Formatting clean-up.
	(read_memory_nobpt): Ditto.
	(ep_is_catchpoint): Ditto.
	(ep_is_shlib_catchpoint): Ditto.
	(ep_is_exception_catchpoint): Ditto.
	(describe_other_breakpoints): Ditto.

Index: breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.25
diff -c -3 -p -r1.25 breakpoint.c
*** breakpoint.c	2001/02/08 06:03:52	1.25
--- breakpoint.c	2001/03/01 03:47:34
*************** static char *ep_parse_optional_filename 
*** 197,208 ****
  static void catch_exec_command_1 (char *arg, int tempflag, int from_tty);
  #endif
  
! static void create_exception_catchpoint
!   (int tempflag, char *cond_string,
!    enum exception_event_kind ex_event, struct symtab_and_line *sal);
  
! static void catch_exception_command_1
!   (enum exception_event_kind ex_event, char *arg, int tempflag, int from_tty);
  
  static void tcatch_command (char *arg, int from_tty);
  
--- 197,208 ----
  static void catch_exec_command_1 (char *arg, int tempflag, int from_tty);
  #endif
  
! static void create_exception_catchpoint (int tempflag, char *cond_string,
! 					 enum exception_event_kind ex_event,
! 					 struct symtab_and_line *sal);
  
! static void catch_exception_command_1 (enum exception_event_kind ex_event, 
! 				       char *arg, int tempflag, int from_tty);
  
  static void tcatch_command (char *arg, int from_tty);
  
*************** read_memory_nobpt (CORE_ADDR memaddr, ch
*** 696,705 ****
        if (bp_addr + bp_size < memaddr + len)
  	{
  	  /* Copy the section of memory after the breakpoint.  */
! 	  status = read_memory_nobpt
! 	    (bp_addr + bp_size,
! 	     myaddr + bp_addr + bp_size - memaddr,
! 	     memaddr + len - (bp_addr + bp_size));
  	  if (status != 0)
  	    return status;
  	}
--- 696,704 ----
        if (bp_addr + bp_size < memaddr + len)
  	{
  	  /* Copy the section of memory after the breakpoint.  */
! 	  status = read_memory_nobpt (bp_addr + bp_size,
! 				      myaddr + bp_addr + bp_size - memaddr,
! 				      memaddr + len - (bp_addr + bp_size));
  	  if (status != 0)
  	    return status;
  	}
*************** ep_is_catchpoint (struct breakpoint *ep)
*** 1613,1623 ****
      || (ep->type == bp_catch_vfork)
      || (ep->type == bp_catch_exec)
      || (ep->type == bp_catch_catch)
!     || (ep->type == bp_catch_throw)
  
- 
    /* ??rehrauer: Add more kinds here, as are implemented... */
-     ;
  }
  
  int
--- 1612,1620 ----
      || (ep->type == bp_catch_vfork)
      || (ep->type == bp_catch_exec)
      || (ep->type == bp_catch_catch)
!     || (ep->type == bp_catch_throw);
  
    /* ??rehrauer: Add more kinds here, as are implemented... */
  }
  
  int
*************** ep_is_shlib_catchpoint (struct breakpoin
*** 1625,1632 ****
  {
    return
      (ep->type == bp_catch_load)
!     || (ep->type == bp_catch_unload)
!     ;
  }
  
  int
--- 1622,1628 ----
  {
    return
      (ep->type == bp_catch_load)
!     || (ep->type == bp_catch_unload);
  }
  
  int
*************** ep_is_exception_catchpoint (struct break
*** 1634,1641 ****
  {
    return
      (ep->type == bp_catch_catch)
!     || (ep->type == bp_catch_throw)
!     ;
  }
  
  /* Clear a bpstat so that it says we are not at any breakpoint.
--- 1630,1636 ----
  {
    return
      (ep->type == bp_catch_catch)
!     || (ep->type == bp_catch_throw);
  }
  
  /* Clear a bpstat so that it says we are not at any breakpoint.
*************** print_one_breakpoint (struct breakpoint 
*** 3338,3347 ****
  	  annotate_field (4);
  	  /* FIXME-32x64: need a print_address_numeric with
  	     field width */
! 	  printf_filtered
! 	    ("%s ",
! 	     local_hex_string_custom
! 	     ((unsigned long) b->address, "08l"));
  	}
        annotate_field (5);
        *last_addr = b->address;
--- 3333,3341 ----
  	  annotate_field (4);
  	  /* FIXME-32x64: need a print_address_numeric with
  	     field width */
! 	  printf_filtered ("%s ",
! 			   local_hex_string_custom
! 			   ((unsigned long) b->address, "08l"));
  	}
        annotate_field (5);
        *last_addr = b->address;
*************** describe_other_breakpoints (CORE_ADDR pc
*** 3681,3695 ****
  	    b->section == section)
  	  {
  	    others--;
! 	    printf_filtered
! 	      ("%d%s%s ",
! 	       b->number,
! 	       ((b->enable == disabled || 
! 		 b->enable == shlib_disabled || 
! 		 b->enable == call_disabled) ? " (disabled)" 
! 		: b->enable == permanent ? " (permanent)"
! 		: ""),
! 	       (others > 1) ? "," : ((others == 1) ? " and" : ""));
  	  }
        printf_filtered ("also set at pc ");
        print_address_numeric (pc, 1, gdb_stdout);
--- 3675,3689 ----
  	    b->section == section)
  	  {
  	    others--;
! 	    printf_filtered ("%d%s%s ",
! 			     b->number,
! 			     ((b->enable == disabled || 
! 			       b->enable == shlib_disabled || 
! 			       b->enable == call_disabled) ? " (disabled)" 
! 			      : b->enable == permanent ? " (permanent)"
! 			      : ""),
! 			     (others > 1) ? "," 
! 			     : ((others == 1) ? " and" : ""));
  	  }
        printf_filtered ("also set at pc ");
        print_address_numeric (pc, 1, gdb_stdout);