Re: [RFA]: Repost of grep ^func patch

[Kevin Buettner <kevinb@cygnus.com>]

On Jan 26, 12:24pm, Don Howard wrote:

> Index: gdbtypes.h
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtypes.h,v
> retrieving revision 1.6
> diff -p -u -w -r1.6 gdbtypes.h
> --- gdbtypes.h	2000/09/02 00:05:43	1.6
> +++ gdbtypes.h	2001/01/26 19:44:38
> @@ -1,6 +1,7 @@
>  /* Internal type definitions for GDB.
> -   Copyright (C) 1992-1994, 1996, 1998-2000 Free Software Foundation, Inc.
> -   Contributed by Cygnus Support, using pieces from other GDB modules.
> +   Copyright (C) 1992-1994, 1996, 1998, 1999, 2000 Free Software
> +   Foundation, Inc.  Contributed by Cygnus Support, using pieces from
> +   other GDB modules.

Shouldn't that be...

   Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001
   Free Software Foundation, Inc.
   Contributed by Cygnus Support, using pieces from other GDB modules.

...which does the following:

  1) Remove the (C)
  2) List the 1992-1994 range explicitly.
  3) Add the missing 2001.
  4) Keep the newline structure intact.  (I agree with Eli on this point.)

[...]
> -extern void
> -smash_to_method_type (struct type *, struct type *, struct type *,
> +extern void smash_to_method_type (struct type *, struct type *, struct type *, 
>  		      struct type **);

For this one (and others like it), I'd prefer to see the trailing
``struct type**);'' reindented so that it lines up to match the rest
of the declaration.  I.e, it should end up looking like this:

extern void smash_to_method_type (struct type *, struct type *, struct type *, 
                                  struct type **);


> Index: i386v-nat.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/i386v-nat.c,v
> retrieving revision 1.7
> diff -p -u -w -r1.7 i386v-nat.c
> --- i386v-nat.c	2000/07/30 01:48:25	1.7
> +++ i386v-nat.c	2001/01/26 19:45:36
> @@ -1,5 +1,6 @@
> -/* Intel 386 native support for SYSV systems (pre-SVR4).
> -   Copyright (C) 1988, 89, 91, 92, 94, 96, 1998 Free Software Foundation, Inc.
> +/* Intel 386 native support for SYSV systems (pre-SVR4).  Copyright
> +   (C) 1988, 89, 91, 92, 94, 96, 1998, 2001 Free Software Foundation,
> +   Inc.

Again, try to keep the newline structure intact.  Personally, I'd
prefer to see it as follows:

/* Intel 386 native support for SYSV systems (pre-SVR4).
   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1998, 2001
   Free Software Foundation, Inc.

Kevin
From fnasser@redhat.com Fri Jan 26 16:53:00 2001
From: Fernando Nasser <fnasser@redhat.com>
To: gdb-patches@sources.redhat.com
Subject: Re: RFC: Fix to double parsing of filenames in GDB command line
Date: Fri, 26 Jan 2001 16:53:00 -0000
Message-id: <3A721BA3.7A7F739A@redhat.com>
References: <3A6FA46E.1955116E@redhat.com>
X-SW-Source: 2001-01/msg00316.html
Content-length: 306

I checked it in.  Everything works on my systems but I will be
monitoring
the list over the weekend just in case.

Let me know if you see something suspicious.

-- 
Fernando Nasser
Red Hat Canada Ltd.                     E-Mail:  fnasser@redhat.com
2323 Yonge Street, Suite #300
Toronto, Ontario   M4P 2C9
From eliz@is.elta.co.il Sat Jan 27 00:42:00 2001
From: "Eli Zaretskii" <eliz@is.elta.co.il>
To: dhoward@cygnus.com
Cc: gdb-patches@sources.redhat.com
Subject: Re: [RFA]: Repost of grep ^func patch
Date: Sat, 27 Jan 2001 00:42:00 -0000
Message-id: <2110-Sat27Jan2001104200+0200-eliz@is.elta.co.il>
References: <Pine.SOL.3.91.1010126122028.16183B-100000@taarna.cygnus.com>
X-SW-Source: 2001-01/msg00317.html
Content-length: 496

> Date: Fri, 26 Jan 2001 12:24:50 -0800 (PST)
> From: Don Howard <dhoward@cygnus.com>
> 
> Ok, one more time with the pathes fixed so that it will apply cleanly...

The go32-nat.c patch still reformats the comment I asked not to:

> @@ -1,6 +1,6 @@
>  /* Native debugging support for Intel x86 running DJGPP.
> -   Copyright 1997, 1999 Free Software Foundation, Inc.
> -   Written by Robert Hoehne.
> +   Copyright 1997, 1999, 2001 Free Software Foundation, Inc.  Written
> +   by Robert Hoehne.
From kettenis@wins.uva.nl Sat Jan 27 03:58:00 2001
From: Mark Kettenis <kettenis@wins.uva.nl>
To: gdb-patches@sources.redhat.com
Subject: [PATH, RFA]: Fix UI_OUT related problem in stack.c:print_frame()
Date: Sat, 27 Jan 2001 03:58:00 -0000
Message-id: <200101271125.f0RBPtA02984@delius.kettenis.local>
X-SW-Source: 2001-01/msg00318.html
Content-length: 3465

Hi,

Right now GDB will report an internal error if you use `q' to quit
from a long backtrace a couple of time.  Obviously in this case
ui_out_list_end() isn't called and after calling ui_out_list_begin()
four times the following message is printed:

   ui_out: list depth exceeded; only 4 levels of lists can be nested.

The attached fixes this by adding ui_out_list_end() to the list of
cleanup actions.  I introduced make_cleanup_ui_out_list_end() to avoid
compiler warnings and since I expect that there might very well be
more cases where this sort of thing is needed.

OK to install?


2001-01-27  Mark Kettenis  <kettenis@gnu.org>

	* ui-out.c (do_list_end): New function.
	(make_cleanup_ui_out_list_end): New function.
	* ui-out.h: Provide prototype for make_cleanup_ui_out_list_end.
	* stack.c (print_frame) [UI_OUT]: Call
	make_cleanup_ui_out_list_end to make sure we mark the end of the
	list if we do a non-local exit.  At the end of the function,
	instead of calling ui_out_list_end directly, let do_cleanups
	handle it.


Index: ui-out.c
===================================================================
RCS file: /cvs/src/src/gdb/ui-out.c,v
retrieving revision 1.6
diff -u -p -r1.6 ui-out.c
--- ui-out.c 2000/12/15 01:01:50 1.6
+++ ui-out.c 2001/01/27 11:18:37
@@ -281,6 +281,18 @@ ui_out_list_end (struct ui_out *uiout)
   uiout->list_flag--;
 }
 
+static void
+do_list_end (void *uiout)
+{
+  ui_out_list_end (uiout);
+}
+
+struct cleanup *
+make_cleanup_ui_out_list_end (struct ui_out *uiout)
+{
+  return make_cleanup (do_list_end, uiout);
+}
+
 void
 ui_out_field_int (struct ui_out *uiout, char *fldname, int value)
 {
Index: ui-out.h
===================================================================
RCS file: /cvs/src/src/gdb/ui-out.h,v
retrieving revision 1.2
diff -u -p -r1.2 ui-out.h
--- ui-out.h 2000/05/28 01:12:33 1.2
+++ ui-out.h 2001/01/27 11:18:37
@@ -81,6 +81,8 @@ extern void ui_out_list_begin (struct ui
 
 extern void ui_out_list_end (struct ui_out *uiout);
 
+extern struct cleanup *make_cleanup_ui_out_list_end (struct ui_out *uiout);
+
 extern void ui_out_field_int (struct ui_out *uiout, char *fldname, int value);
 
 extern void ui_out_field_core_addr (struct ui_out *uiout, char *fldname,
Index: stack.c
===================================================================
RCS file: /cvs/src/src/gdb/stack.c,v
retrieving revision 1.10
diff -u -p -r1.10 stack.c
--- stack.c 2000/12/15 01:01:49 1.10
+++ stack.c 2001/01/27 11:18:38
@@ -1,5 +1,6 @@
 /* Print and select stack frames for GDB, the GNU debugger.
-   Copyright 1986, 1987, 1989, 1991-1996, 1998-2000 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996,
+   1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -448,6 +449,7 @@ print_frame (struct frame_info *fi, 
 #ifdef UI_OUT
   struct ui_stream *stb;
   struct cleanup *old_chain;
+  struct cleanup *list_chain;
 
   stb = ui_out_stream_new (uiout);
   old_chain = make_cleanup_ui_out_stream_delete (stb);
@@ -532,6 +534,7 @@ print_frame (struct frame_info *fi, 
 
 #ifdef UI_OUT
   ui_out_list_begin (uiout, "frame");
+  list_chain = make_cleanup_ui_out_list_end (uiout);
 #endif
 
   if (level >= 0)
@@ -661,7 +664,7 @@ print_frame (struct frame_info *fi, 
 #endif /* PC_SOLIB */
 
 #ifdef UI_OUT
-  ui_out_list_end (uiout);
+  do_cleanups (list_chain);
   ui_out_text (uiout, "\n");
   do_cleanups (old_chain);
 #else