From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31922 invoked by alias); 30 May 2012 20:41:33 -0000 Received: (qmail 31816 invoked by uid 22791); 30 May 2012 20:41:31 -0000 X-SWARE-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,SPF_HELO_PASS,TW_BJ,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 30 May 2012 20:41:16 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4UKfDvg027108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 May 2012 16:41:13 -0400 Received: from host2.jankratochvil.net (ovpn-116-47.ams2.redhat.com [10.36.116.47]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q4UKf67b013704 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 30 May 2012 16:41:09 -0400 Date: Wed, 30 May 2012 20:41:00 -0000 From: Jan Kratochvil To: markus.t.metzger@intel.com Cc: kettenis@gnu.org, gdb-patches@sourceware.org, markus.t.metzger@gmail.com Subject: Re: [PATCH 02/16] source: add flags to print_source_lines () Message-ID: <20120530204106.GB20633@host2.jankratochvil.net> References: <1337772151-20265-1-git-send-email-markus.t.metzger@intel.com> <1337772151-20265-3-git-send-email-markus.t.metzger@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1337772151-20265-3-git-send-email-markus.t.metzger@intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-05/txt/msg01057.txt.bz2 On Wed, 23 May 2012 13:22:17 +0200, markus.t.metzger@intel.com wrote: > From: Markus Metzger > > The 4th parameter of print_source_lines is a boolean flag noerror. Generalize > this to be a bit vector of flags and make noerror one of the flag bits. > > 2012-05-23 Markus Metzger > > gdb/ > * symtab.h (print_source_lines_flags): New enum > * source.c (print_source_lines_base): Change noerror to flags > (print_source_lines): Change noerror to flags The indentation should not be there, just: gdb/ * symtab.h (print_source_lines_flags): New enum. * source.c (print_source_lines_base): Change noerror to flags. (print_source_lines): Change noerror to flags. And every sentence should be terminated by a dot. > > > --- > gdb/source.c | 14 ++++++-------- > gdb/symtab.h | 5 +++++ > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/gdb/source.c b/gdb/source.c > index 27c5b0e..4dd7ed2 100644 > --- a/gdb/source.c > +++ b/gdb/source.c > @@ -1225,10 +1225,8 @@ identify_source_line (struct symtab *s, int line, int mid_statement, > /* Print source lines from the file of symtab S, > starting with line number LINE and stopping before line number STOPLINE. */ > > -static void print_source_lines_base (struct symtab *s, int line, int stopline, > - int noerror); > static void > -print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) > +print_source_lines_base (struct symtab *s, int line, int stopline, int flags) Make it then 'enum print_source_lines_flags flags'. > { > int c; > int desc; > @@ -1256,13 +1254,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) > else > { > desc = last_source_error; > - noerror = 1; > + flags |= PRINT_SOURCE_LINES_NOERROR; > } > } > else > { > desc = last_source_error; > - noerror = 1; > + flags |= PRINT_SOURCE_LINES_NOERROR; > noprint = 1; > } > > @@ -1270,7 +1268,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) > { > last_source_error = desc; > > - if (!noerror) > + if (!(flags & PRINT_SOURCE_LINES_NOERROR)) > { > char *name = alloca (strlen (s->filename) + 100); > sprintf (name, "%d\t%s", line, s->filename); > @@ -1356,9 +1354,9 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) > window otherwise it is simply printed. */ > > void > -print_source_lines (struct symtab *s, int line, int stopline, int noerror) > +print_source_lines (struct symtab *s, int line, int stopline, int flags) Here again. > { > - print_source_lines_base (s, line, stopline, noerror); > + print_source_lines_base (s, line, stopline, flags); > } > > /* Print info on range of pc's in a specified line. */ > diff --git a/gdb/symtab.h b/gdb/symtab.h > index 526fe5a..a8c57cf 100644 > --- a/gdb/symtab.h > +++ b/gdb/symtab.h > @@ -1143,6 +1143,11 @@ extern void clear_solib (void); > > extern int identify_source_line (struct symtab *, int, int, CORE_ADDR); > > +/* Flags passed as 4th argument to print_source_lines. */ > +enum print_source_lines_flags { > + PRINT_SOURCE_LINES_NOERROR = (0x1 << 0) > +}; GNU Coding Style formatting is (+I changed 0x1, it is just a bit): enum print_source_lines_flags { PRINT_SOURCE_LINES_NOERROR = (1 << 0) }; > + > extern void print_source_lines (struct symtab *, int, int, int); > > extern void forget_cached_source_info_for_objfile (struct objfile *); > -- > 1.7.1 Thanks, Jan