projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatic date update in version.in
[deliverable/binutils-gdb.git]
/
gdb
/
build-id.c
diff --git
a/gdb/build-id.c
b/gdb/build-id.c
index 945da4f3cfbf99cf44477e50da46cfeb6545e829..c8eacbd1e81cacc9688f0ebb9070ed1a8d362d1d 100644
(file)
--- a/
gdb/build-id.c
+++ b/
gdb/build-id.c
@@
-70,62
+70,46
@@
build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
gdb_bfd_ref_ptr
build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
{
gdb_bfd_ref_ptr
build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
{
- char *link, *debugdir;
- VEC (char_ptr) *debugdir_vec;
- struct cleanup *back_to;
- int ix;
gdb_bfd_ref_ptr abfd;
gdb_bfd_ref_ptr abfd;
- int alloc_len;
-
- /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
- alloc_len = (strlen (debug_file_directory)
- + (sizeof "/.build-id/" - 1) + 1
- + 2 * build_id_len + (sizeof ".debug" - 1) + 1);
- link = (char *) alloca (alloc_len);
/* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
cause "/.build-id/..." lookups. */
/* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
cause "/.build-id/..." lookups. */
- debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory);
-
back_to = make_cleanup_free_char_ptr_vec (debugdir_vec
);
+ std::vector<gdb::unique_xmalloc_ptr<char>> debugdir_vec
+
= dirnames_to_char_ptr_vec (debug_file_directory
);
- for (
ix = 0; VEC_iterate (char_ptr, debugdir_vec, ix, debugdir); ++ix
)
+ for (
const gdb::unique_xmalloc_ptr<char> &debugdir : debugdir_vec
)
{
{
- size_t debugdir_len = strlen (debugdir);
const gdb_byte *data = build_id;
size_t size = build_id_len;
const gdb_byte *data = build_id;
size_t size = build_id_len;
- char *s;
- char *filename = NULL;
- struct cleanup *inner;
-
memcpy (link, debugdir, debugdir_len
);
-
s = &link[debugdir_len]
;
- s += sprintf (s, "/.build-id/");
+
std::string link = debugdir.get (
);
+
link += "/.build-id/"
;
+
if (size > 0)
{
size--;
if (size > 0)
{
size--;
- s
+= sprintf (s, "%02x
", (unsigned) *data++);
+ s
tring_appendf (link, "%02x/
", (unsigned) *data++);
}
}
- if (size > 0)
- *s++ = '/';
+
while (size-- > 0)
while (size-- > 0)
- s += sprintf (s, "%02x", (unsigned) *data++);
- strcpy (s, ".debug");
+ string_appendf (link, "%02x", (unsigned) *data++);
+
+ link += ".debug";
if (separate_debug_file_debug)
if (separate_debug_file_debug)
- printf_unfiltered (_(" Trying %s\n"), link);
+ printf_unfiltered (_(" Trying %s\n"), link
.c_str ()
);
/* lrealpath() is expensive even for the usually non-existent files. */
/* lrealpath() is expensive even for the usually non-existent files. */
- if (access (link, F_OK) == 0)
- filename = lrealpath (link);
+ gdb::unique_xmalloc_ptr<char> filename;
+ if (access (link.c_str (), F_OK) == 0)
+ filename.reset (lrealpath (link.c_str ()));
if (filename == NULL)
continue;
/* We expect to be silent on the non-existing files. */
if (filename == NULL)
continue;
/* We expect to be silent on the non-existing files. */
- inner = make_cleanup (xfree, filename);
- abfd = gdb_bfd_open (filename, gnutarget, -1);
- do_cleanups (inner);
+ abfd = gdb_bfd_open (filename.get (), gnutarget, -1);
if (abfd == NULL)
continue;
if (abfd == NULL)
continue;
@@
-136,13
+120,12
@@
build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
abfd.release ();
}
abfd.release ();
}
- do_cleanups (back_to);
return abfd;
}
/* See build-id.h. */
return abfd;
}
/* See build-id.h. */
-char *
+std::string
find_separate_debug_file_by_buildid (struct objfile *objfile)
{
const struct bfd_build_id *build_id;
find_separate_debug_file_by_buildid (struct objfile *objfile)
{
const struct bfd_build_id *build_id;
@@
-163,7
+146,8
@@
find_separate_debug_file_by_buildid (struct objfile *objfile)
warning (_("\"%s\": separate debug info file has no debug info"),
bfd_get_filename (abfd.get ()));
else if (abfd != NULL)
warning (_("\"%s\": separate debug info file has no debug info"),
bfd_get_filename (abfd.get ()));
else if (abfd != NULL)
- return
xstrdup
(bfd_get_filename (abfd.get ()));
+ return
std::string
(bfd_get_filename (abfd.get ()));
}
}
- return NULL;
+
+ return std::string ();
}
}
This page took
0.034479 seconds
and
4
git commands to generate.