aboutsummaryrefslogtreecommitdiff
path: root/libctf/ctf-lookup.c
diff options
context:
space:
mode:
authorNick Alcock <nick.alcock@oracle.com>2021-03-18 12:37:52 +0000
committerNick Alcock <nick.alcock@oracle.com>2021-03-18 12:37:52 +0000
commit087945261c7523ed895e48a97418ec6dee6cdb67 (patch)
tree0aa276ff4c07816d30d92c256a4aed521a94f97d /libctf/ctf-lookup.c
parenta1f463bedd63b6524cc32930185df93ede3765f9 (diff)
downloadgdb-087945261c7523ed895e48a97418ec6dee6cdb67.zip
gdb-087945261c7523ed895e48a97418ec6dee6cdb67.tar.gz
gdb-087945261c7523ed895e48a97418ec6dee6cdb67.tar.bz2
libctf: fix some tabdamage and move some code around
ctf-link.c is unnecessarily confusing because ctf_link_lazy_open is positioned near functions that have nothing to do with opening files. Move it around, and fix some tabdamage that's crept in lately. libctf/ChangeLog 2021-03-18 Nick Alcock <nick.alcock@oracle.com> * ctf-link.c (ctf_link_lazy_open): Move up in the file, to near ctf_link_add_ctf. * ctf-lookup.c (ctf_lookup_symbol_idx): Repair tabdamage. (ctf_lookup_by_sym_or_name): Likewise. * testsuite/libctf-lookup/struct-iteration.c: Likewise. * testsuite/libctf-regression/type-add-unnamed-struct.c: Likewise.
Diffstat (limited to 'libctf/ctf-lookup.c')
-rw-r--r--libctf/ctf-lookup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libctf/ctf-lookup.c b/libctf/ctf-lookup.c
index 6e17e5f..2e78cf4 100644
--- a/libctf/ctf-lookup.c
+++ b/libctf/ctf-lookup.c
@@ -592,9 +592,9 @@ ctf_lookup_symbol_idx (ctf_dict_t *fp, const char *symname)
cache->ctf_symhash_latest) < 0)
goto oom;
if (strcmp (sym.st_name, symname) == 0)
- return cache->ctf_symhash_latest++;
- }
- break;
+ return cache->ctf_symhash_latest++;
+ }
+ break;
case sizeof (Elf32_Sym):
{
Elf32_Sym *symp = (Elf32_Sym *) sp->cts_data;
@@ -607,8 +607,8 @@ ctf_lookup_symbol_idx (ctf_dict_t *fp, const char *symname)
cache->ctf_symhash_latest) < 0)
goto oom;
if (strcmp (sym.st_name, symname) == 0)
- return cache->ctf_symhash_latest++;
- }
+ return cache->ctf_symhash_latest++;
+ }
break;
default:
ctf_set_errno (fp, ECTF_SYMTAB);
@@ -902,7 +902,7 @@ ctf_lookup_by_sym_or_name (ctf_dict_t *fp, unsigned long symidx,
if (symidx > fp->ctf_dynsymmax)
goto try_parent;
- sym = fp->ctf_dynsymidx[symidx];
+ sym = fp->ctf_dynsymidx[symidx];
err = ECTF_NOTYPEDAT;
if (!sym || (sym->st_shndx != STT_OBJECT && sym->st_shndx != STT_FUNC))
goto try_parent;