[PATCH] Pending breakpoints

[PATCH] Pending breakpoints

[Nick Roberts]

utils.c defines three new functions: nquery and yquery which appear to have
been introduced with the new pending breakpoints feature. nquery and yquery
generate new annotation types: ^Z^Znquery and ^Z^Zyquery respectively. This
breaks the Emacs interface to GDB (gdb-ui.el) that I am developing. I can
easily install a fix but I am surprised that new annotations are being defined
as it is a feature that I thought GDB developers wanted to make
obsolete. Also, I wonder if it is really necessary as the user interface only
needs to know that GDB is expecting input. This patch makes the annotations
from nquery and yquery consistent with other prompts for input.

Nick

*** utils.c.~1.120.~	2004-04-29 20:42:47.000000000 +0100
--- utils.c	2004-05-10 21:21:33.000000000 +0100
***************
*** 1388,1400 ****
        gdb_flush (gdb_stdout);
  
        if (annotation_level > 1)
! 	printf_filtered ("\n\032\032pre-%cquery\n", defchar);
  
        vfprintf_filtered (gdb_stdout, ctlstr, args);
        printf_filtered ("(%s or %s) ", y_string, n_string);
  
        if (annotation_level > 1)
! 	printf_filtered ("\n\032\032%cquery\n", defchar);
  
        wrap_here ("");
        gdb_flush (gdb_stdout);
--- 1388,1400 ----
        gdb_flush (gdb_stdout);
  
        if (annotation_level > 1)
! 	printf_filtered ("\n\032\032pre-query\n");
  
        vfprintf_filtered (gdb_stdout, ctlstr, args);
        printf_filtered ("(%s or %s) ", y_string, n_string);
  
        if (annotation_level > 1)
! 	printf_filtered ("\n\032\032query\n");
  
        wrap_here ("");
        gdb_flush (gdb_stdout);
***************
*** 1438,1444 ****
      }
  
    if (annotation_level > 1)
!     printf_filtered ("\n\032\032post-%cquery\n", defchar);
    return retval;
  }
--- 1438,1444 ----
      }
  
    if (annotation_level > 1)
!     printf_filtered ("\n\032\032post-query\n");
    return retval;
  }

Re: [PATCH] Pending breakpoints

[Andrew Cagney]

utils.c defines three new functions: nquery and yquery which appear to have
been introduced with the new pending breakpoints feature. nquery and yquery
generate new annotation types: ^Z^Znquery and ^Z^Zyquery respectively. This
breaks the Emacs interface to GDB (gdb-ui.el) that I am developing. I can
easily install a fix but I am surprised that new annotations are being defined
as it is a feature that I thought GDB developers wanted to make
obsolete. Also, I wonder if it is really necessary as the user interface only
needs to know that GDB is expecting input. This patch makes the annotations
from nquery and yquery consistent with other prompts for input.
(mutter something rude :-)

Yes, ok.  Also ok for the branch (Was there a ChangeLog?)

Andrew

Nick

*** utils.c.~1.120.~	2004-04-29 20:42:47.000000000 +0100
--- utils.c	2004-05-10 21:21:33.000000000 +0100
***************
*** 1388,1400 ****
        gdb_flush (gdb_stdout);
  
        if (annotation_level > 1)
! 	printf_filtered ("\n\032\032pre-%cquery\n", defchar);
  
        vfprintf_filtered (gdb_stdout, ctlstr, args);
        printf_filtered ("(%s or %s) ", y_string, n_string);
  
        if (annotation_level > 1)
! 	printf_filtered ("\n\032\032%cquery\n", defchar);
  
        wrap_here ("");
        gdb_flush (gdb_stdout);
--- 1388,1400 ----
        gdb_flush (gdb_stdout);
  
        if (annotation_level > 1)
! 	printf_filtered ("\n\032\032pre-query\n");
  
        vfprintf_filtered (gdb_stdout, ctlstr, args);
        printf_filtered ("(%s or %s) ", y_string, n_string);
  
        if (annotation_level > 1)
! 	printf_filtered ("\n\032\032query\n");
  
        wrap_here ("");
        gdb_flush (gdb_stdout);
***************
*** 1438,1444 ****
      }
  
    if (annotation_level > 1)
!     printf_filtered ("\n\032\032post-%cquery\n", defchar);
    return retval;
  }
--- 1438,1444 ----
      }
  
    if (annotation_level > 1)
!     printf_filtered ("\n\032\032post-query\n");
    return retval;
  }

Re: [PATCH] Pending breakpoints

[Nick Roberts]

 > Yes, ok.

Commited to HEAD.

 > Also ok for the branch 

For the 6.1.1 respin right? How do I do that?

 > (Was there a ChangeLog?)

Its here:

2004-05-11  Nick Roberts  <nickrob@gnu.org>

	* utils.c (defaulted_query): Just use the normal query input type
	when printing the annotations.



Nick

Re: [PATCH] Pending breakpoints

[Nick Roberts]

 > >  > Also ok for the branch 
 > > 
 > > For the 6.1.1 respin right? How do I do that?
 > 
 > Yes.  Off the top of my head:
 > 
 > $ cvs -d:ext:sources.redhat.com:/cvs/src co -r gdb_6_1-branch gdb
 > ...

And download millions of files? I'm not falling for that again!
I did:

cvs up -r gdb_6_1-branch

You might like to check I've not goofed.

Nick