From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27181 invoked by alias); 3 Apr 2003 15:40:40 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 27171 invoked from network); 3 Apr 2003 15:40:39 -0000 Received: from unknown (63.119.183.65) by sources.redhat.com with QMTP; 3 Apr 2003 15:40:39 -0000 Received: (qmail 11922 invoked from network); 3 Apr 2003 15:42:37 -0000 Received: from cpe-24-221-209-215.co.sprintbbd.net (HELO doc.com) (24.221.209.215) by external1 with SMTP; 3 Apr 2003 15:42:37 -0000 Message-ID: <3E8C55F3.9090705@doc.com> Date: Thu, 03 Apr 2003 15:40:00 -0000 From: Adam Fedor User-Agent: Mozilla/5.0 (X11; U; Linux ppc; en-US; rv:1.1) Gecko/20020905 X-Accept-Language: en-us, en MIME-Version: 1.0 To: GDB Patches Subject: [PATCH]: Replace DEPRECIATED_SYMBOL_NAME in objc-lang.c Content-Type: multipart/mixed; boundary="------------060008070701030504010504" X-SW-Source: 2003-04/txt/msg00052.txt.bz2 This is a multi-part message in MIME format. --------------060008070701030504010504 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 60 I'll commit this in a few days if there are no objections. --------------060008070701030504010504 Content-Type: text/plain; name="objc_depreciated.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="objc_depreciated.patch" Content-length: 3650 2003-04-01 Adam Fedor * gdb/objc-lang.c (selectors_info): Replace calls to SYMBOL_DEMANGLED_NAME and DEPRECIEATED_SYMBOL_NAME with SYMBOL_NATURAL_NAME. (classes_info, find_methods): Likewise. Index: objc-lang.c =================================================================== RCS file: /cvs/src/src/gdb/objc-lang.c,v retrieving revision 1.15 diff -u -p -r1.15 objc-lang.c --- objc-lang.c 2 Apr 2003 03:02:46 -0000 1.15 +++ objc-lang.c 2 Apr 2003 03:35:01 -0000 @@ -897,9 +897,7 @@ selectors_info (char *regexp, int from_t ALL_MSYMBOLS (objfile, msymbol) { QUIT; - name = SYMBOL_DEMANGLED_NAME (msymbol); - if (name == NULL) - name = DEPRECATED_SYMBOL_NAME (msymbol); + name = SYMBOL_NATURAL_NAME (msymbol); if (name && (name[0] == '-' || name[0] == '+') && name[1] == '[') /* Got a method name. */ @@ -930,9 +928,7 @@ selectors_info (char *regexp, int from_t ALL_MSYMBOLS (objfile, msymbol) { QUIT; - name = SYMBOL_DEMANGLED_NAME (msymbol); - if (name == NULL) - name = DEPRECATED_SYMBOL_NAME (msymbol); + name = SYMBOL_NATURAL_NAME (msymbol); if (name && (name[0] == '-' || name[0] == '+') && name[1] == '[') /* Got a method name. */ @@ -956,9 +952,7 @@ selectors_info (char *regexp, int from_t char *p = asel; QUIT; - name = SYMBOL_DEMANGLED_NAME (sym_arr[ix]); - if (name == NULL) - name = DEPRECATED_SYMBOL_NAME (sym_arr[ix]); + name = SYMBOL_NATURAL_NAME (sym_arr[ix]); name = strchr (name, ' ') + 1; if (p[0] && specialcmp(name, p) == 0) continue; /* Seen this one already (not unique). */ @@ -1040,9 +1034,7 @@ classes_info (char *regexp, int from_tty ALL_MSYMBOLS (objfile, msymbol) { QUIT; - name = SYMBOL_DEMANGLED_NAME (msymbol); - if (name == NULL) - name = DEPRECATED_SYMBOL_NAME (msymbol); + name = SYMBOL_NATURAL_NAME (msymbol); if (name && (name[0] == '-' || name[0] == '+') && name[1] == '[') /* Got a method name. */ @@ -1066,9 +1058,7 @@ classes_info (char *regexp, int from_tty ALL_MSYMBOLS (objfile, msymbol) { QUIT; - name = SYMBOL_DEMANGLED_NAME (msymbol); - if (name == NULL) - name = DEPRECATED_SYMBOL_NAME (msymbol); + name = SYMBOL_NATURAL_NAME (msymbol); if (name && (name[0] == '-' || name[0] == '+') && name[1] == '[') /* Got a method name. */ @@ -1085,9 +1075,7 @@ classes_info (char *regexp, int from_tty char *p = aclass; QUIT; - name = SYMBOL_DEMANGLED_NAME (sym_arr[ix]); - if (name == NULL) - name = DEPRECATED_SYMBOL_NAME (sym_arr[ix]); + name = SYMBOL_NATURAL_NAME (sym_arr[ix]); name += 2; if (p[0] && specialcmp(name, p) == 0) continue; /* Seen this one already (not unique). */ @@ -1348,9 +1336,7 @@ find_methods (struct symtab *symtab, cha /* Not in the specified symtab. */ continue; - symname = SYMBOL_DEMANGLED_NAME (msymbol); - if (symname == NULL) - symname = DEPRECATED_SYMBOL_NAME (msymbol); + symname = SYMBOL_NATURAL_NAME (msymbol); if (symname == NULL) continue; @@ -1386,10 +1372,8 @@ find_methods (struct symtab *symtab, cha sym = find_pc_function (SYMBOL_VALUE_ADDRESS (msymbol)); if (sym != NULL) { - const char *newsymname = SYMBOL_DEMANGLED_NAME (sym); + const char *newsymname = SYMBOL_NATURAL_NAME (sym); - if (newsymname == NULL) - newsymname = DEPRECATED_SYMBOL_NAME (sym); if (strcmp (symname, newsymname) == 0) { /* Found a high-level method sym: swap it into the --------------060008070701030504010504--