* gdbtk.c (gdb_get_breakpoint_info): Return error if breakpoint

	type is not bp_breakpoint.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aff118362a7f606c0d26aaebb74f7c386d9234c0..468ca2578a60fcef179294ff4250593a7d188275 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 Wed Mar  8 16:12:21 1995  Stu Grossman  (grossman@cygnus.com)
 
+       * gdbtk.c (gdb_get_breakpoint_info):  Return error if breakpoint
+       type is not bp_breakpoint.
+
        * source.c (forward_search_command reverse_search_command):  Set
        convenience variable $_ to be the line # of the match.
        * symtab.c (decode_line_1):  Allow convenience variables to be

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index 97e3b8372e86a2c0245cd32686c4825c1654fada..fd4aeed49688792facd666f17ff544e21b396287 100644 (file)
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -205,12 +205,9 @@ gdb_get_breakpoint_info (clientData, interp, argc, argv)
     if (b->number == bpnum)
       break;
 
-  if (!b)
+  if (!b || b->type != bp_breakpoint)
     error ("Breakpoint #%d does not exist", bpnum);
 
-  if (b->type != bp_breakpoint)
-    return;
-
   sal = find_pc_line (b->address, 0);
 
   Tcl_DStringAppendElement (result_ptr, symtab_to_filename (sal.symtab));
@@ -289,7 +286,6 @@ gdb_loc (clientData, interp, argc, argv)
      char *argv[];
 {
   char *filename;
-  char buf[100];
   struct symtab_and_line sal;
   char *funcname;
   CORE_ADDR pc;
@@ -329,11 +325,9 @@ gdb_loc (clientData, interp, argc, argv)
   filename = symtab_to_filename (sal.symtab);
   Tcl_DStringAppendElement (result_ptr, filename);
 
-  sprintf (buf, "%d", sal.line);
-  Tcl_DStringAppendElement (result_ptr, buf); /* line number */
+  dsprintf_append_element (result_ptr, "%d", sal.line); /* line number */
 
-  sprintf (buf, "0x%lx", pc);
-  Tcl_DStringAppendElement (result_ptr, buf); /* PC */
+  dsprintf_append_element (result_ptr, "0x%lx", pc); /* PC */
 
   return TCL_OK;
 }
@@ -382,7 +376,6 @@ gdb_sourcelines (clientData, interp, argc, argv)
   struct symtab *symtab;
   struct linetable_entry *le;
   int nlines;
-  char buf[100];
 
   if (argc != 2)
     error ("wrong # args");
@@ -412,8 +405,7 @@ gdb_sourcelines (clientData, interp, argc, argv)
          && le->pc == (le + 1)->pc)
        continue;
 
-      sprintf (buf, "%d", le->line);
-      Tcl_DStringAppendElement (result_ptr, buf);
+      dsprintf_append_element (result_ptr, "%d", le->line);
     }
 
   return TCL_OK;
@@ -576,8 +568,7 @@ register_changed_p (regnum, argp)
   memcpy (&old_regs[REGISTER_BYTE (regnum)], raw_buffer,
          REGISTER_RAW_SIZE (regnum));
 
-  sprintf (buf, "%d", regnum);
-  Tcl_DStringAppendElement (result_ptr, buf);
+  dsprintf_append_element (result_ptr, "%d", regnum);
 }
 
 static int