aboutsummaryrefslogtreecommitdiff
path: root/libbacktrace/mmap.c
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2013-12-05 18:32:02 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2013-12-05 18:32:02 +0000
commitbfd74f227df4eac35e4336f4a888907c33f0c041 (patch)
treea21a16be4ac9b12fe22e13697ded7ead64c31b02 /libbacktrace/mmap.c
parente69dbe3721a150e221e05edde4985dd961edafd1 (diff)
downloadgcc-bfd74f227df4eac35e4336f4a888907c33f0c041.zip
gcc-bfd74f227df4eac35e4336f4a888907c33f0c041.tar.gz
gcc-bfd74f227df4eac35e4336f4a888907c33f0c041.tar.bz2
alloc.c (backtrace_vector_finish): Add error_callback and data parameters.
* alloc.c (backtrace_vector_finish): Add error_callback and data parameters. Call backtrace_vector_release. Return address base. * mmap.c (backtrace_vector_finish): Add error_callback and data parameters. Return address base. * dwarf.c (read_function_info): Get new address base from backtrace_vector_finish. * internal.h (backtrace_vector_finish): Update declaration. From-SVN: r205716
Diffstat (limited to 'libbacktrace/mmap.c')
-rw-r--r--libbacktrace/mmap.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/libbacktrace/mmap.c b/libbacktrace/mmap.c
index 04aae85..dc94b29 100644
--- a/libbacktrace/mmap.c
+++ b/libbacktrace/mmap.c
@@ -230,12 +230,19 @@ backtrace_vector_grow (struct backtrace_state *state,size_t size,
/* Finish the current allocation on VEC. */
-void
-backtrace_vector_finish (struct backtrace_state *state ATTRIBUTE_UNUSED,
- struct backtrace_vector *vec)
+void *
+backtrace_vector_finish (
+ struct backtrace_state *state ATTRIBUTE_UNUSED,
+ struct backtrace_vector *vec,
+ backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
+ void *data ATTRIBUTE_UNUSED)
{
+ void *ret;
+
+ ret = vec->base;
vec->base = (char *) vec->base + vec->size;
vec->size = 0;
+ return ret;
}
/* Release any extra space allocated for VEC. */