diff options
| author | Paul Jensen <pauljensen@google.com> | 2016-02-02 00:02:27 -0500 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2016-02-02 00:02:27 -0500 |
| commit | 51d3c5fa9c0ad7dd551c05b06a62ecec09c029d8 (patch) | |
| tree | 1f79f8e84c17bfded3baa763b50c9e30a4cac228 | |
| parent | e1caf6d87d16f7dfbc83a5501d4ecfb85faa83f3 (diff) | |
| download | apf-51d3c5fa9c0ad7dd551c05b06a62ecec09c029d8.tar.gz | |
Avoid compiler errors and enforce all warnings/errors.
Change-Id: I13305afc93942be7dbca0ae123aedf76c7a88135
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | apf_interpreter.c | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -8,6 +8,7 @@ LOCAL_INCLUDES += $(LOCAL_PATH) LOCAL_CFLAGS += \ -DAPF_FRAME_HEADER_SIZE=14 \ -std=c99 \ + -Wall \ -Werror LOCAL_SRC_FILES += apf_interpreter.c diff --git a/apf_interpreter.c b/apf_interpreter.c index 001acb9..3960c93 100644 --- a/apf_interpreter.c +++ b/apf_interpreter.c @@ -192,9 +192,9 @@ int accept_packet(const uint8_t* program, uint32_t program_len, const uint8_t* packet, uint32_t packet_len, uint32_t filter_age) { // Is offset within program bounds? -#define IN_PROGRAM_BOUNDS(p) (ENFORCE_UNSIGNED(p), (p) < program_len) +#define IN_PROGRAM_BOUNDS(p) (ENFORCE_UNSIGNED(p) && (p) < program_len) // Is offset within packet bounds? -#define IN_PACKET_BOUNDS(p) (ENFORCE_UNSIGNED(p), (p) < packet_len) +#define IN_PACKET_BOUNDS(p) (ENFORCE_UNSIGNED(p) && (p) < packet_len) // Accept packet if not within program bounds #define ASSERT_IN_PROGRAM_BOUNDS(p) ASSERT_RETURN(IN_PROGRAM_BOUNDS(p)) // Accept packet if not within packet bounds @@ -380,7 +380,7 @@ int accept_packet(const uint8_t* program, uint32_t program_len, // If LDM_EXT_OPCODE is 0 and imm is compared with it, a compiler error will result, // instead just enforce that imm is unsigned (so it's always greater or equal to 0). #if LDM_EXT_OPCODE == 0 - ENFORCE_UNSIGNED(imm), + ENFORCE_UNSIGNED(imm) && #else imm >= LDM_EXT_OPCODE && #endif |