* rs6000-nat.c (add_vmap, vmap_ldinfo, vmap_exec): Replace

	DEPRECATED_STREQ by its expression.
	* coffread.c (coff_locate_sections, coff_symtab_read): Likewise.
	* xcoffread.c (read_xcoff_symtab, read_symbol_lineno, find_linenos)
	(scan_xcoff_symtab): Likewise.
	* hppa-hpux-tdep.c (hppa_hpux_skip_trampoline_code): Likewise.
	* f-lang.c (find_common_for_function): Likewise.
	* objc-exp.y (parse_number): Likewise.

	* defs.h (DEPRECATED_STREQ): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bada3d0b52c364662203016ff56e1b9acb0b4cee..a02ed59b718a8f1fb80481c400d3db4b9a6e83db 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2008-01-16  Markus Deuling  <deuling@de.ibm.com>
+
+       * rs6000-nat.c (add_vmap, vmap_ldinfo, vmap_exec): Replace
+       DEPRECATED_STREQ by its expression.
+       * coffread.c (coff_locate_sections, coff_symtab_read): Likewise.
+       * xcoffread.c (read_xcoff_symtab, read_symbol_lineno, find_linenos)
+       (scan_xcoff_symtab): Likewise.
+       * hppa-hpux-tdep.c (hppa_hpux_skip_trampoline_code): Likewise.
+       * f-lang.c (find_common_for_function): Likewise.
+       * objc-exp.y (parse_number): Likewise.
+
+       * defs.h (DEPRECATED_STREQ): Remove.
+
 2008-01-16  Markus Deuling  <deuling@de.ibm.com>
 
        * mn10300-tdep.h (AM33_MODE): Add gdbarch as parameter.

diff --git a/gdb/coffread.c b/gdb/coffread.c
index ad866079d6e005240c88c0a4fa7da2ad9e59d794..a8d552366989595a34590cf04cf73139520a26bc 100644 (file)
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -198,7 +198,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void *csip)
 
   csi = (struct coff_symfile_info *) csip;
   name = bfd_get_section_name (abfd, sectp);
-  if (DEPRECATED_STREQ (name, ".text"))
+  if (strcmp (name, ".text") == 0)
     {
       csi->textaddr = bfd_section_vma (abfd, sectp);
       csi->textsize += bfd_section_size (abfd, sectp);
@@ -207,7 +207,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void *csip)
     {
       csi->textsize += bfd_section_size (abfd, sectp);
     }
-  else if (DEPRECATED_STREQ (name, ".stabstr"))
+  else if (strcmp (name, ".stabstr") == 0)
     {
       csi->stabstrsect = sectp;
     }
@@ -823,7 +823,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
        case C_THUMBSTATFUNC:
          if (cs->c_name[0] == '.')
            {
-             if (DEPRECATED_STREQ (cs->c_name, ".text"))
+             if (strcmp (cs->c_name, ".text") == 0)
                {
                  /* FIXME:  don't wire in ".text" as section name
                     or symbol name! */
@@ -947,7 +947,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
          break;
 
        case C_FCN:
-         if (DEPRECATED_STREQ (cs->c_name, ".bf"))
+         if (strcmp (cs->c_name, ".bf") == 0)
            {
              within_function = 1;
 
@@ -969,7 +969,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
              new->name =
                process_coff_symbol (&fcn_cs_saved, &fcn_aux_saved, objfile);
            }
-         else if (DEPRECATED_STREQ (cs->c_name, ".ef"))
+         else if (strcmp (cs->c_name, ".ef") == 0)
            {
              if (!within_function)
                error (_("Bad coff function information."));
@@ -1045,13 +1045,13 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
          break;
 
        case C_BLOCK:
-         if (DEPRECATED_STREQ (cs->c_name, ".bb"))
+         if (strcmp (cs->c_name, ".bb") == 0)
            {
              tmpaddr = cs->c_value;
              tmpaddr += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
              push_context (++depth, tmpaddr);
            }
-         else if (DEPRECATED_STREQ (cs->c_name, ".eb"))
+         else if (strcmp (cs->c_name, ".eb") == 0)
            {
              if (context_stack_depth <= 0)
                {               /* We attempted to pop an empty context stack */

diff --git a/gdb/defs.h b/gdb/defs.h
index a310fc63e4683ddb88b199043ec30d3849f3e68c..85778cbf81d01541f80f83d5d66fd77c95fa663e 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -153,7 +153,6 @@ typedef bfd_vma CORE_ADDR;
    not responsible for any breakage due to code that relied on the old
    underlying implementation.  */
 
-#define DEPRECATED_STREQ(a,b) (strcmp ((a), (b)) == 0)
 #define DEPRECATED_STREQN(a,b,c) (strncmp ((a), (b), (c)) == 0)
 
 /* Check if a character is one of the commonly used C++ marker characters.  */

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 74c5bd9121261156555ae8409cc911c66d6ff2ac..fb169fb929a94fcd2a8e622198767d8f31e8b572 100644 (file)
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -637,8 +637,8 @@ find_common_for_function (char *name, char *funcname)
 
   while (tmp != NULL)
     {
-      if (DEPRECATED_STREQ (tmp->name, name)
-         && DEPRECATED_STREQ (tmp->owning_function, funcname))
+      if (strcmp (tmp->name, name) == 0
+         && strcmp (tmp->owning_function, funcname) == 0)
        return (tmp);
       else
        tmp = tmp->next;

diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index 1a07c04c50d53c65503f770c415839333d684433..e7de80502de4e42feffb0acd09484ecb19b75215 100644 (file)
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -376,7 +376,8 @@ hppa_hpux_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
          ALL_MSYMBOLS (objfile, msymbol)
          {
            if (MSYMBOL_TYPE (msymbol) == mst_text
-               && DEPRECATED_STREQ (DEPRECATED_SYMBOL_NAME (msymbol), DEPRECATED_SYMBOL_NAME (msym)))
+               && strcmp (DEPRECATED_SYMBOL_NAME (msymbol),
+                           DEPRECATED_SYMBOL_NAME (msym)) == 0)
              {
                function_found = 1;
                break;

diff --git a/gdb/objc-exp.y b/gdb/objc-exp.y
index a4a42d920a5bb9605fad842a8700882e636cb07b..e8648795287b71f4568ab6570f6f7d6956a6b401 100644 (file)
--- a/gdb/objc-exp.y
+++ b/gdb/objc-exp.y
@@ -680,7 +680,7 @@ qualified_name:     typebase COLONCOLON name
                            error ("`%s' is not defined as an aggregate type.",
                                   TYPE_NAME (type));
 
-                         if (!DEPRECATED_STREQ (type_name_no_tag (type), $4.ptr))
+                         if (strcmp (type_name_no_tag (type), $4.ptr) != 0)
                            error ("invalid destructor `%s::~%s'",
                                   type_name_no_tag (type), $4.ptr);
 

diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index 27153534fcb4ee4da82c6e6dcb125c4fd3c5ae7c..02a7946a241f335c6f958dadde582315081f315c 100644 (file)
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -762,7 +762,7 @@ add_vmap (LdInfo *ldi)
       last = 0;
       /* FIXME??? am I tossing BFDs?  bfd? */
       while ((last = bfd_openr_next_archived_file (abfd, last)))
-       if (DEPRECATED_STREQ (mem, last->filename))
+       if (strcmp (mem, last->filename) == 0)
          break;
 
       if (!last)
@@ -846,8 +846,8 @@ vmap_ldinfo (LdInfo *ldi)
 
          /* The filenames are not always sufficient to match on. */
 
-         if ((name[0] == '/' && !DEPRECATED_STREQ (name, vp->name))
-             || (memb[0] && !DEPRECATED_STREQ (memb, vp->member)))
+         if ((name[0] == '/' && strcmp (name, vp->name) != 0)
+             || (memb[0] && strcmp (memb, vp->member) != 0))
            continue;
 
          /* See if we are referring to the same file.
@@ -944,17 +944,19 @@ vmap_exec (void)
 
   for (i = 0; &exec_ops.to_sections[i] < exec_ops.to_sections_end; i++)
     {
-      if (DEPRECATED_STREQ (".text", exec_ops.to_sections[i].the_bfd_section->name))
+      if (strcmp (".text", exec_ops.to_sections[i].the_bfd_section->name) == 0)
        {
          exec_ops.to_sections[i].addr += vmap->tstart - vmap->tvma;
          exec_ops.to_sections[i].endaddr += vmap->tstart - vmap->tvma;
        }
-      else if (DEPRECATED_STREQ (".data", exec_ops.to_sections[i].the_bfd_section->name))
+      else if (strcmp (".data",
+                      exec_ops.to_sections[i].the_bfd_section->name) == 0)
        {
          exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma;
          exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma;
        }
-      else if (DEPRECATED_STREQ (".bss", exec_ops.to_sections[i].the_bfd_section->name))
+      else if (strcmp (".bss",
+                      exec_ops.to_sections[i].the_bfd_section->name) == 0)
        {
          exec_ops.to_sections[i].addr += vmap->dstart - vmap->dvma;
          exec_ops.to_sections[i].endaddr += vmap->dstart - vmap->dvma;

diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index d8a0c620eaaf70c4a32aa348d9bf5e476f8e8286..5f128fc4173adb3afef863d8a0c42e09f29fe618 100644 (file)
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -1251,7 +1251,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
          break;
 
        case C_FCN:
-         if (DEPRECATED_STREQ (cs->c_name, ".bf"))
+         if (strcmp (cs->c_name, ".bf") == 0)
            {
              CORE_ADDR off = ANOFFSET (objfile->section_offsets,
                                        SECT_OFF_TEXT (objfile));
@@ -1268,7 +1268,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
              if (new->name != NULL)
                SYMBOL_SECTION (new->name) = SECT_OFF_TEXT (objfile);
            }
-         else if (DEPRECATED_STREQ (cs->c_name, ".ef"))
+         else if (strcmp (cs->c_name, ".ef") == 0)
            {
 
              bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
@@ -1362,7 +1362,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
          break;
 
        case C_BLOCK:
-         if (DEPRECATED_STREQ (cs->c_name, ".bb"))
+         if (strcmp (cs->c_name, ".bb") == 0)
            {
              depth++;
              new = push_context (depth,
@@ -1370,7 +1370,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
                                   + ANOFFSET (objfile->section_offsets,
                                               SECT_OFF_TEXT (objfile))));
            }
-         else if (DEPRECATED_STREQ (cs->c_name, ".eb"))
+         else if (strcmp (cs->c_name, ".eb") == 0)
            {
              if (context_stack_depth <= 0)
                {               /* We attempted to pop an empty context stack */
@@ -1666,7 +1666,7 @@ read_symbol_lineno (int symno)
       if (symbol->n_sclass == C_FCN)
        {
          char *name = xcoff64 ? strtbl + symbol->n_offset : symbol->n_name;
-         if (DEPRECATED_STREQ (name, ".bf"))
+         if (strcmp (name, ".bf") == 0)
            goto gotit;
        }
       symno += symbol->n_numaux + 1;
@@ -1700,7 +1700,7 @@ find_linenos (struct bfd *abfd, struct bfd_section *asect, void *vpinfo)
 
   count = asect->lineno_count;
 
-  if (!DEPRECATED_STREQ (asect->name, ".text") || count == 0)
+  if (strcmp (asect->name, ".text") != 0 || count == 0)
     return;
 
   size = count * coff_data (abfd)->local_linesz;
@@ -2525,12 +2525,12 @@ scan_xcoff_symtab (struct objfile *objfile)
               things like "break c-exp.y:435" need to work (I
               suppose the psymtab_include_list could be hashed or put
               in a binary tree, if profiling shows this is a major hog).  */
-           if (pst && DEPRECATED_STREQ (namestring, pst->filename))
+           if (pst && strcmp (namestring, pst->filename) == 0)
              continue;
            {
              int i;
              for (i = 0; i < includes_used; i++)
-               if (DEPRECATED_STREQ (namestring, psymtab_include_list[i]))
+               if (strcmp (namestring, psymtab_include_list[i]) == 0)
                  {
                    i = -1;
                    break;