Use dwarf_diename in place of open-coding it.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 3aa75c817587c2c242d60966e4bf164f520ce55e..c2f66cbca5aab92a34eae39674a9c9f75443f909 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-10  Roland McGrath  <roland@redhat.com>
+
+       * dwarf_getscopevar.c: Use dwarf_diename.
+
 2009-08-09  Roland McGrath  <roland@redhat.com>
 
        * libdw.map (ELFUTILS_0.143): New version set,

diff --git a/libdw/dwarf_getscopevar.c b/libdw/dwarf_getscopevar.c
index 4e5b429efdbe0089b0faa51eb5a6d70a08922b99..6ce214f5f01eb3395a2506706890effbcb63efc1 100644 (file)
--- a/libdw/dwarf_getscopevar.c
+++ b/libdw/dwarf_getscopevar.c
@@ -1,5 +1,5 @@
 /* Find a named variable or parameter within given scopes.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005-2009 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -129,9 +129,7 @@ dwarf_getscopevar (Dwarf_Die *scopes, int nscopes,
              }
 
            /* Only get here for a variable or parameter.  Check the name.  */
-           Dwarf_Attribute attr_mem;
-           const char *diename = INTUSE(dwarf_formstring)
-             (INTUSE(dwarf_attr_integrate) (result, DW_AT_name, &attr_mem));
+           const char *diename = INTUSE(dwarf_diename) (result);
            if (diename != NULL && !strcmp (name, diename))
              {
                /* We have a matching name.  */