From 67d89901506da74d00a482b7560237dce404b41c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 6 Apr 2017 16:38:56 -0600 Subject: Change find_pcs_for_symtab_line to return a std::vector This changes find_pcs_for_symtab_line to return a std::vector. This allows the removal of some cleanups. gdb/ChangeLog 2017-04-12 Tom Tromey * symtab.h (find_pcs_for_symtab_line): Change return type. * symtab.c (find_pcs_for_symtab_line): Change return type. * python/py-linetable.c (build_line_table_tuple_from_pcs): Change type of "vec". Update. (ltpy_get_pcs_for_line): Update. * linespec.c (decode_digits_ordinary): Update. --- gdb/symtab.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gdb/symtab.c') diff --git a/gdb/symtab.c b/gdb/symtab.c index cc2f400..20ef76d 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -3289,15 +3289,15 @@ done: } /* Given SYMTAB, returns all the PCs function in the symtab that - exactly match LINE. Returns NULL if there are no exact matches, - but updates BEST_ITEM in this case. */ + exactly match LINE. Returns an empty vector if there are no exact + matches, but updates BEST_ITEM in this case. */ -VEC (CORE_ADDR) * +std::vector find_pcs_for_symtab_line (struct symtab *symtab, int line, struct linetable_entry **best_item) { int start = 0; - VEC (CORE_ADDR) *result = NULL; + std::vector result; /* First, collect all the PCs that are at this line. */ while (1) @@ -3320,8 +3320,7 @@ find_pcs_for_symtab_line (struct symtab *symtab, int line, break; } - VEC_safe_push (CORE_ADDR, result, - SYMTAB_LINETABLE (symtab)->item[idx].pc); + result.push_back (SYMTAB_LINETABLE (symtab)->item[idx].pc); start = idx + 1; } -- cgit v1.1