From 087945261c7523ed895e48a97418ec6dee6cdb67 Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Thu, 18 Mar 2021 12:37:52 +0000 Subject: 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 * 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. --- libctf/testsuite/libctf-lookup/struct-iteration.c | 6 +++--- libctf/testsuite/libctf-regression/type-add-unnamed-struct.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libctf/testsuite') diff --git a/libctf/testsuite/libctf-lookup/struct-iteration.c b/libctf/testsuite/libctf-lookup/struct-iteration.c index 080edfa..005aba1 100644 --- a/libctf/testsuite/libctf-lookup/struct-iteration.c +++ b/libctf/testsuite/libctf-lookup/struct-iteration.c @@ -4,13 +4,13 @@ static int print_struct (const char *name, ctf_id_t membtype, unsigned long offset, - void *fp_) + void *fp_) { ctf_dict_t *fp = (ctf_dict_t *) fp_; char *type_name = ctf_type_aname (fp, membtype); printf ("iter test: %s, offset %lx, has type %lx/%s\n", - name, offset, membtype, type_name); + name, offset, membtype, type_name); free (type_name); return 0; @@ -54,7 +54,7 @@ main (int argc, char *argv[]) char *type_name = ctf_type_aname (fp, membtype); printf ("next test: %s, offset %lx, has type %lx/%s\n", - name, offset, membtype, type_name); + name, offset, membtype, type_name); free (type_name); } if (ctf_errno (fp) != ECTF_NEXT_END) diff --git a/libctf/testsuite/libctf-regression/type-add-unnamed-struct.c b/libctf/testsuite/libctf-regression/type-add-unnamed-struct.c index 98be257..43c3934 100644 --- a/libctf/testsuite/libctf-regression/type-add-unnamed-struct.c +++ b/libctf/testsuite/libctf-regression/type-add-unnamed-struct.c @@ -47,7 +47,7 @@ main (int argc, char *argv[]) for (walk = membs; *walk != NULL; walk++) { if (ctf_member_info (dyn, newtype, *walk, &mi) < 0) - goto lookup_err; + goto lookup_err; printf ("Looked up %s, type %lx, offset %lx\n", *walk, (long) mi.ctm_type, mi.ctm_offset); } -- cgit v1.1