mirror of
https://github.com/Motorhead1991/qemu.git
synced 2026-03-02 16:14:48 -07:00
maint: Fix macros with broken 'do/while(0); ' usage
The point of writing a macro embedded in a 'do { ... } while (0)'
loop (particularly if the macro has multiple statements or would
otherwise end with an 'if' statement) is so that the macro can be
used as a drop-in statement with the caller supplying the
trailing ';'. Although our coding style frowns on brace-less 'if':
if (cond)
statement;
else
something else;
that is the classic case where failure to use do/while(0) wrapping
would cause the 'else' to pair with any embedded 'if' in the macro
rather than the intended outer 'if'. But conversely, if the macro
includes an embedded ';', then the same brace-less coding style
would now have two statements, making the 'else' a syntax error
rather than pairing with the outer 'if'. Thus, even though our
coding style with required braces is not impacted, ending a macro
with ';' makes our code harder to port to projects that use
brace-less styles.
The change should have no semantic impact. I was not able to
fully compile-test all of the changes (as some of them are
examples of the ugly bit-rotting debug print statements that are
completely elided by default, and I didn't want to recompile
with the necessary -D witnesses - cleaning those up is left as a
bite-sized task for another day); I did, however, audit that for
all files touched, all callers of the changed macros DID supply
a trailing ';' at the callsite, and did not appear to be used
as part of a brace-less conditional.
Found mechanically via: $ git grep -B1 'while (0);' | grep -A1 \\\\
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20171201232433.25193-7-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
241187c118
commit
2562755ee7
34 changed files with 42 additions and 42 deletions
|
|
@ -32,7 +32,7 @@ typedef struct {
|
|||
do { \
|
||||
memread(addr, &field, sizeof(field)); \
|
||||
addr += sizeof(field); \
|
||||
} while (0);
|
||||
} while (0)
|
||||
|
||||
#define ACPI_READ_ARRAY_PTR(arr, length, addr) \
|
||||
do { \
|
||||
|
|
@ -40,7 +40,7 @@ typedef struct {
|
|||
for (idx = 0; idx < length; ++idx) { \
|
||||
ACPI_READ_FIELD(arr[idx], addr); \
|
||||
} \
|
||||
} while (0);
|
||||
} while (0)
|
||||
|
||||
#define ACPI_READ_ARRAY(arr, addr) \
|
||||
ACPI_READ_ARRAY_PTR(arr, sizeof(arr) / sizeof(arr[0]), addr)
|
||||
|
|
@ -56,7 +56,7 @@ typedef struct {
|
|||
ACPI_READ_FIELD((table)->oem_revision, addr); \
|
||||
ACPI_READ_ARRAY((table)->asl_compiler_id, addr); \
|
||||
ACPI_READ_FIELD((table)->asl_compiler_revision, addr); \
|
||||
} while (0);
|
||||
} while (0)
|
||||
|
||||
#define ACPI_ASSERT_CMP(actual, expected) do { \
|
||||
char ACPI_ASSERT_CMP_str[5] = {}; \
|
||||
|
|
@ -77,7 +77,7 @@ typedef struct {
|
|||
ACPI_READ_FIELD((field).bit_offset, addr); \
|
||||
ACPI_READ_FIELD((field).access_width, addr); \
|
||||
ACPI_READ_FIELD((field).address, addr); \
|
||||
} while (0);
|
||||
} while (0)
|
||||
|
||||
|
||||
uint8_t acpi_calc_checksum(const uint8_t *data, int len);
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ do \
|
|||
fprintf (stderr, "FAILED at %s:%d\n", __FILE__, __LINE__); \
|
||||
exit (EXIT_FAILURE); \
|
||||
} \
|
||||
} while (0);
|
||||
} while (0)
|
||||
|
||||
unsigned char *dummybuf;
|
||||
static unsigned int pagesize;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue