diff options
Diffstat (limited to 'libctf')
| -rw-r--r-- | libctf/ChangeLog | 9 | ||||
| -rw-r--r-- | libctf/ctf-archive.c | 3 | ||||
| -rw-r--r-- | libctf/ctf-dedup.c | 67 | ||||
| -rw-r--r-- | libctf/ctf-dump.c | 3 | ||||
| -rw-r--r-- | libctf/ctf-lookup.c | 3 | ||||
| -rw-r--r-- | libctf/swap.h | 24 |
6 files changed, 63 insertions, 46 deletions
diff --git a/libctf/ChangeLog b/libctf/ChangeLog index 4e4e9af..f64493f 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,5 +1,14 @@ 2021-03-18 Nick Alcock <nick.alcock@oracle.com> + * ctf-archive.c (ctf_archive_next): GNU style fix for do {} while. + * ctf-dedup.c (ctf_dedup_rhash_type): Likewise. + (ctf_dedup_rwalk_one_output_mapping): Likewise. + * ctf-dump.c (ctf_dump_format_type): Likewise. + * ctf-lookup.c (ctf_symbol_next): Likewise. + * swap.h (swap_thing): Likewise. + +2021-03-18 Nick Alcock <nick.alcock@oracle.com> + * ctf-serialize.c: General reshuffling, and... (emit_symtypetab_state_t): New, migrated from local variables in ctf_serialize. diff --git a/libctf/ctf-archive.c b/libctf/ctf-archive.c index 8b8e170..e0ceb80 100644 --- a/libctf/ctf-archive.c +++ b/libctf/ctf-archive.c @@ -1156,7 +1156,8 @@ ctf_archive_next (const ctf_archive_t *wrapper, ctf_next_t **it, const char **na name_ = &nametbl[le64toh (modent[i->ctn_n].name_offset)]; i->ctn_n++; - } while (skip_parent && strcmp (name_, _CTF_SECTION) == 0); + } + while (skip_parent && strcmp (name_, _CTF_SECTION) == 0); if (name) *name = name_; diff --git a/libctf/ctf-dedup.c b/libctf/ctf-dedup.c index ef8507a..9f5ba90 100644 --- a/libctf/ctf-dedup.c +++ b/libctf/ctf-dedup.c @@ -589,7 +589,8 @@ ctf_dedup_rhash_type (ctf_dict_t *fp, ctf_dict_t *input, ctf_dict_t **inputs, goto oom; \ if (ctf_dynset_cinsert (citers, hval) < 0) \ goto oom; \ - } while (0) + } \ + while (0) /* If this is a named struct or union or a forward to one, and this is a child traversal, treat this type as if it were a forward -- do not recurse to @@ -2029,42 +2030,44 @@ ctf_dedup_rwalk_one_output_mapping (ctf_dict_t *output, times, which is worse. */ #define CTF_TYPE_WALK(type, errlabel, errmsg) \ - do { \ - void *type_id; \ - const char *hashval; \ - int cited_type_input_num = input_num; \ + do \ + { \ + void *type_id; \ + const char *hashval; \ + int cited_type_input_num = input_num; \ \ - if ((fp->ctf_flags & LCTF_CHILD) && (LCTF_TYPE_ISPARENT (fp, type))) \ - cited_type_input_num = parents[input_num]; \ + if ((fp->ctf_flags & LCTF_CHILD) && (LCTF_TYPE_ISPARENT (fp, type))) \ + cited_type_input_num = parents[input_num]; \ \ - type_id = CTF_DEDUP_GID (output, cited_type_input_num, type); \ + type_id = CTF_DEDUP_GID (output, cited_type_input_num, type); \ \ - if (type == 0) \ - { \ - ctf_dprintf ("Walking: unimplemented type\n"); \ - break; \ - } \ + if (type == 0) \ + { \ + ctf_dprintf ("Walking: unimplemented type\n"); \ + break; \ + } \ \ - ctf_dprintf ("Looking up ID %i/%lx in type hashes\n", \ - cited_type_input_num, type); \ - hashval = ctf_dynhash_lookup (d->cd_type_hashes, type_id); \ - if (!ctf_assert (output, hashval)) \ - { \ - whaterr = N_("error looking up ID in type hashes"); \ - goto errlabel; \ - } \ - ctf_dprintf ("ID %i/%lx has hash %s\n", cited_type_input_num, type, \ - hashval); \ + ctf_dprintf ("Looking up ID %i/%lx in type hashes\n", \ + cited_type_input_num, type); \ + hashval = ctf_dynhash_lookup (d->cd_type_hashes, type_id); \ + if (!ctf_assert (output, hashval)) \ + { \ + whaterr = N_("error looking up ID in type hashes"); \ + goto errlabel; \ + } \ + ctf_dprintf ("ID %i/%lx has hash %s\n", cited_type_input_num, type, \ + hashval); \ \ - ret = ctf_dedup_rwalk_output_mapping (output, inputs, ninputs, parents, \ - already_visited, hashval, \ - visit_fun, arg, depth); \ - if (ret < 0) \ - { \ - whaterr = errmsg; \ - goto errlabel; \ - } \ - } while (0) + ret = ctf_dedup_rwalk_output_mapping (output, inputs, ninputs, parents, \ + already_visited, hashval, \ + visit_fun, arg, depth); \ + if (ret < 0) \ + { \ + whaterr = errmsg; \ + goto errlabel; \ + } \ + } \ + while (0) switch (ctf_type_kind_unsliced (fp, type)) { diff --git a/libctf/ctf-dump.c b/libctf/ctf-dump.c index 788355d..409626a 100644 --- a/libctf/ctf-dump.c +++ b/libctf/ctf-dump.c @@ -220,7 +220,8 @@ ctf_dump_format_type (ctf_dict_t *fp, ctf_id_t id, int flag) new_id = ctf_type_reference (fp, id); if (new_id != CTF_ERR) str = str_append (str, " -> "); - } while (new_id != CTF_ERR); + } + while (new_id != CTF_ERR); if (ctf_errno (fp) != ECTF_NOTREF) { diff --git a/libctf/ctf-lookup.c b/libctf/ctf-lookup.c index 2e78cf4..9d1e6d8 100644 --- a/libctf/ctf-lookup.c +++ b/libctf/ctf-lookup.c @@ -723,7 +723,8 @@ ctf_symbol_next (ctf_dict_t *fp, ctf_next_t **it, const char **name, *name = ctf_strptr (fp, idx[i->ctn_n]); sym = tab[i->ctn_n++]; - } while (sym == -1u || sym == 0); + } + while (sym == -1u || sym == 0); } else { diff --git a/libctf/swap.h b/libctf/swap.h index d7cc993..4d0b48c 100644 --- a/libctf/swap.h +++ b/libctf/swap.h @@ -73,18 +73,20 @@ bswap_64 (uint64_t v) /* Swap the endianness of something. */ #define swap_thing(x) \ - do { \ - _Static_assert (sizeof (x) == 1 || (sizeof (x) % 2 == 0 \ - && sizeof (x) <= 8), \ - "Invalid size, update endianness code"); \ - switch (sizeof (x)) { \ - case 2: x = bswap_16 (x); break; \ - case 4: x = bswap_32 (x); break; \ - case 8: x = bswap_64 (x); break; \ - case 1: /* Nothing needs doing */ \ - break; \ + do \ + { \ + _Static_assert (sizeof (x) == 1 || (sizeof (x) % 2 == 0 \ + && sizeof (x) <= 8), \ + "Invalid size, update endianness code"); \ + switch (sizeof (x)) { \ + case 2: x = bswap_16 (x); break; \ + case 4: x = bswap_32 (x); break; \ + case 8: x = bswap_64 (x); break; \ + case 1: /* Nothing needs doing */ \ + break; \ + } \ } \ - } while (0); + while (0); #endif /* !defined(_CTF_SWAP_H) */ |