diff options
| author |   mpi <mpi@openbsd.org> | 2016-03-06 19:05:30 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-03-06 19:05:30 +0000 |
| commit | 702da75537c7dd2d59e940629dd0f8844c383b9a (patch) | |
| tree | 112d5e091e78e068a49c19c81f9299ee8798054e | |
| parent | explict_bzero for some asn1 free's - ok miod@ (diff) | |
| download | wireguard-openbsd-702da75537c7dd2d59e940629dd0f8844c383b9a.tar.xz wireguard-openbsd-702da75537c7dd2d59e940629dd0f8844c383b9a.zip | |
Merge db_elf_sym_values() into db_symbol_values().
ok stefan@
| -rw-r--r-- | sys/ddb/db_elf.c | 10 | ||||
| -rw-r--r-- | sys/ddb/db_sym.c | 22 | ||||
| -rw-r--r-- | sys/ddb/db_sym.h | 1 |
3 files changed, 8 insertions, 25 deletions
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c index 5354e2e1635..4c1507b3a50 100644 --- a/sys/ddb/db_elf.c +++ b/sys/ddb/db_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_elf.c,v 1.19 2016/03/01 21:32:02 mpi Exp $ */ +/* $OpenBSD: db_elf.c,v 1.20 2016/03/06 19:05:30 mpi Exp $ */ /* $NetBSD: db_elf.c,v 1.13 2000/07/07 21:55:18 jhawk Exp $ */ /*- @@ -346,13 +346,17 @@ db_elf_sym_search(db_addr_t off, db_strategy_t strategy, * Return the name and value for a symbol. */ void -db_elf_sym_values(db_sym_t sym, char **namep, - db_expr_t *valuep) +db_symbol_values(db_sym_t sym, char **namep, db_expr_t *valuep) { db_symtab_t *stab = &db_symtab; Elf_Sym *symp = (Elf_Sym *)sym; char *strtab; + if (sym == NULL) { + *namep = NULL; + return; + } + if (stab->private == NULL) return; diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index bb3cf4430a6..26907f7530a 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_sym.c,v 1.49 2016/03/01 21:32:02 mpi Exp $ */ +/* $OpenBSD: db_sym.c,v 1.50 2016/03/06 19:05:30 mpi Exp $ */ /* $NetBSD: db_sym.c,v 1.24 2000/08/11 22:50:47 tv Exp $ */ /* @@ -113,26 +113,6 @@ db_search_symbol(db_addr_t val, db_strategy_t strategy, db_expr_t *offp) } /* - * Return name and value of a symbol - */ -void -db_symbol_values(db_sym_t sym, char **namep, db_expr_t *valuep) -{ - db_expr_t value; - - if (sym == NULL) { - *namep = NULL; - return; - } - - db_elf_sym_values(sym, namep, &value); - - if (valuep) - *valuep = value; -} - - -/* * Print a the closest symbol to value * * After matching the symbol according to the given strategy diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h index a1edc94a782..b0b384d93fa 100644 --- a/sys/ddb/db_sym.h +++ b/sys/ddb/db_sym.h @@ -87,7 +87,6 @@ void db_printsym(db_expr_t, db_strategy_t, int (*)(const char *, ...)); /* print closest symbol to a value */ boolean_t db_elf_sym_init(int, void *, void *, const char *); -void db_elf_sym_values(db_sym_t, char **, db_expr_t *); db_sym_t db_elf_sym_search(db_addr_t, db_strategy_t, db_expr_t *); boolean_t db_elf_line_at_pc(db_sym_t, char **, int *, db_expr_t); void db_elf_sym_forall(db_forall_func_t db_forall_func, void *); |