From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20947 invoked by alias); 21 Jan 2013 19:34:01 -0000 Received: (qmail 20923 invoked by uid 22791); 21 Jan 2013 19:34:00 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS 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; Mon, 21 Jan 2013 19:33:49 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0LJXnt8027223 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Jan 2013 14:33:49 -0500 Received: from barimba (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0LJXlDG011043 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 21 Jan 2013 14:33:48 -0500 From: Tom Tromey To: Jan Kratochvil Cc: gdb-patches@sourceware.org Subject: Re: [patch 6/9] Mechanical symtab->filename -> symtab_to_filename References: <20130117222242.GG16249@host2.jankratochvil.net> Date: Mon, 21 Jan 2013 19:34:00 -0000 In-Reply-To: <20130117222242.GG16249@host2.jankratochvil.net> (Jan Kratochvil's message of "Thu, 17 Jan 2013 23:22:42 +0100") Message-ID: <87ip6q1gbo.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: 2013-01/txt/msg00494.txt.bz2 >>>>> "Jan" == Jan Kratochvil writes: Jan> Hi, Jan> this patch is mostly a mechanical substitution: Jan> symtab-> filename -> symtab_to_filename (symtab) Jan> - && loc->line_number == sal.line) Jan> - { Jan> - if (compare_filenames_for_search (loc->symtab->filename, Jan> - sal.symtab->filename)) Jan> - line_match = 1; Jan> - } Jan> + && loc->line_number == sal.line Jan> + && filename_cmp (symtab_to_fullname (loc->symtab), Jan> + sal_fullname) == 0) Jan> + line_match = 1; I found the patch a bit difficult because some spots are the mechanical conversion you mention, but others, like this, use symtab_to_fullname. Jan> + if (function_sal->symtab != NULL Jan> + && compare_filenames_for_search (function_sal->symtab->filename, Jan> + e->filename)) Jan> + return 1; This spot still uses symtab->filename directly. Is that intentional? If so I think it should perhaps have a comment. Jan> + if (symname == NULL Jan> + || filename_cmp (symname, symtab_to_filename (s)) == 0) This spot uses filename_cmp with symtab_to_filename. Is that intentional? It seems a bit strange to me to allow the filename-display setting to control comparisons. Jan> if (! regexp Jan> - || re_exec (symtab->filename)) Jan> + || re_exec (symtab_to_filename (symtab))) Likewise. Jan> @@ -150,7 +152,7 @@ tui_set_source_content (struct symtab *s, [...] Jan> - s->filename) == 0 Jan> + symtab_to_filename (s)) == 0 Likewise. Tom