MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libctf: fix GNU style for do {} while

Browse Source 
It's formatted like this:

do
  {
    ...
  }
while (...);

Not like this:

do
 {
    ...
  } while (...);

or this:

do {
  ...
} while (...);

We used both in various places in libctf.  Fixing it necessitated some
light reindentation.

libctf/ChangeLog
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.
This commit is contained in:
Nick Alcock 2021-03-18 12:37:52 +00:00
parent b9a964318a
commit eefe721ead
6 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libctf/ChangeLog
View File

@ -1,3 +1,12 @@
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> 2021-03-18 Nick Alcock <nick.alcock@oracle.com>
* ctf-serialize.c: General reshuffling, and... * ctf-serialize.c: General reshuffling, and...

3
libctf/ctf-archive.c
View File

@ -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)]; name_ = &nametbl[le64toh (modent[i->ctn_n].name_offset)];
i->ctn_n++; i->ctn_n++;
} while (skip_parent && strcmp (name_, _CTF_SECTION) == 0); }
while (skip_parent && strcmp (name_, _CTF_SECTION) == 0);
if (name) if (name)
*name = name_; *name = name_;

67
libctf/ctf-dedup.c
View File

@ -589,7 +589,8 @@ ctf_dedup_rhash_type (ctf_dict_t *fp, ctf_dict_t *input, ctf_dict_t **inputs,
goto oom; \ goto oom; \
if (ctf_dynset_cinsert (citers, hval) < 0) \ if (ctf_dynset_cinsert (citers, hval) < 0) \
goto oom; \ goto oom; \
} while (0) } \
while (0)
/* If this is a named struct or union or a forward to one, and this is a child /* 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 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. */ times, which is worse. */
#define CTF_TYPE_WALK(type, errlabel, errmsg) \ #define CTF_TYPE_WALK(type, errlabel, errmsg) \
do { \ do \
void *type_id; \ { \
const char *hashval; \ void *type_id; \
int cited_type_input_num = input_num; \ const char *hashval; \
int cited_type_input_num = input_num; \
\ \
if ((fp->ctf_flags & LCTF_CHILD) && (LCTF_TYPE_ISPARENT (fp, type))) \ if ((fp->ctf_flags & LCTF_CHILD) && (LCTF_TYPE_ISPARENT (fp, type))) \
cited_type_input_num = parents[input_num]; \ 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) \ if (type == 0) \
{ \ { \
ctf_dprintf ("Walking: unimplemented type\n"); \ ctf_dprintf ("Walking: unimplemented type\n"); \
break; \ break; \
} \ } \
\ \
ctf_dprintf ("Looking up ID %i/%lx in type hashes\n", \ ctf_dprintf ("Looking up ID %i/%lx in type hashes\n", \
cited_type_input_num, type); \ cited_type_input_num, type); \
hashval = ctf_dynhash_lookup (d->cd_type_hashes, type_id); \ hashval = ctf_dynhash_lookup (d->cd_type_hashes, type_id); \
if (!ctf_assert (output, hashval)) \ if (!ctf_assert (output, hashval)) \
{ \ { \
whaterr = N_("error looking up ID in type hashes"); \ whaterr = N_("error looking up ID in type hashes"); \
goto errlabel; \ goto errlabel; \
} \ } \
ctf_dprintf ("ID %i/%lx has hash %s\n", cited_type_input_num, type, \ ctf_dprintf ("ID %i/%lx has hash %s\n", cited_type_input_num, type, \
hashval); \ hashval); \
\ \
ret = ctf_dedup_rwalk_output_mapping (output, inputs, ninputs, parents, \ ret = ctf_dedup_rwalk_output_mapping (output, inputs, ninputs, parents, \
already_visited, hashval, \ already_visited, hashval, \
visit_fun, arg, depth); \ visit_fun, arg, depth); \
if (ret < 0) \ if (ret < 0) \
{ \ { \
whaterr = errmsg; \ whaterr = errmsg; \
goto errlabel; \ goto errlabel; \
} \ } \
} while (0) } \
while (0)
switch (ctf_type_kind_unsliced (fp, type)) switch (ctf_type_kind_unsliced (fp, type))
{ {

3
libctf/ctf-dump.c
View File

@ -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); new_id = ctf_type_reference (fp, id);
if (new_id != CTF_ERR) if (new_id != CTF_ERR)
str = str_append (str, " -> "); str = str_append (str, " -> ");
} while (new_id != CTF_ERR); }
while (new_id != CTF_ERR);
if (ctf_errno (fp) != ECTF_NOTREF) if (ctf_errno (fp) != ECTF_NOTREF)
{ {

3
libctf/ctf-lookup.c
View File

@ -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]); *name = ctf_strptr (fp, idx[i->ctn_n]);
sym = tab[i->ctn_n++]; sym = tab[i->ctn_n++];
} while (sym == -1u || sym == 0); }
while (sym == -1u || sym == 0);
} }
else else
{ {

24
libctf/swap.h
View File

@ -73,18 +73,20 @@ bswap_64 (uint64_t v)
/* Swap the endianness of something. */ /* Swap the endianness of something. */
#define swap_thing(x) \ #define swap_thing(x) \
do { \ do \
_Static_assert (sizeof (x) == 1 || (sizeof (x) % 2 == 0 \ { \
&& sizeof (x) <= 8), \ _Static_assert (sizeof (x) == 1 || (sizeof (x) % 2 == 0 \
"Invalid size, update endianness code"); \ && sizeof (x) <= 8), \
switch (sizeof (x)) { \ "Invalid size, update endianness code"); \
case 2: x = bswap_16 (x); break; \ switch (sizeof (x)) { \
case 4: x = bswap_32 (x); break; \ case 2: x = bswap_16 (x); break; \
case 8: x = bswap_64 (x); break; \ case 4: x = bswap_32 (x); break; \
case 1: /* Nothing needs doing */ \ case 8: x = bswap_64 (x); break; \
break; \ case 1: /* Nothing needs doing */ \
break; \
} \
} \ } \
} while (0); while (0);
#endif /* !defined(_CTF_SWAP_H) */ #endif /* !defined(_CTF_SWAP_H) */