v5: enable gcc -Wsign-conversion

Test: TreeHugger, manually via devtools/mk
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0573cae7a8fa6f33c75c799f026f11eb3caef024

4 files changed, 5 insertions, 5 deletions

diff --git a/apf_checksum.h b/apf_checksum.h
index aa143a0..3d9e2bc 100644
--- a/apf_checksum.h
+++ b/apf_checksum.h
@@ -4,7 +4,7 @@
  */
 FUNC(u16 calc_csum(u32 sum, const u8* const buf, const s32 len)) {
     s32 i;
-    for (i = 0; i < len; ++i) sum += buf[i] * ((i & 1) ? 1 : 256);
+    for (i = 0; i < len; ++i) sum += buf[i] * ((i & 1) ? 1u : 256u);
 
     sum = (sum & 0xFFFF) + (sum >> 16);  /* max after this is 1FFFE */
     u16 csum = sum + (sum >> 16);
diff --git a/apf_dns.h b/apf_dns.h
index 0d25893..db7f724 100644
--- a/apf_dns.h
+++ b/apf_dns.h
@@ -29,7 +29,7 @@ FUNC(match_result_type match_single_name(const u8* needle,
             if (*ofs >= udp_len) return error_packet;
             u8 w = udp[(*ofs)++];
             if (*ofs > first_unread_offset) first_unread_offset = *ofs;
-            u32 new_ofs = (v - 0xC0) * 256 + w;
+            u32 new_ofs = (v - 0xC0) * 256u + w;
             if (new_ofs >= *ofs) return error_packet;  /* RFC 1035 4.1.4 allows only backward pointers */
             *ofs = new_ofs;
         } else if (v > 63) {
diff --git a/devtools/mk b/devtools/mk
index 0722f75..619aa18 100755
--- a/devtools/mk
+++ b/devtools/mk
@@ -21,7 +21,7 @@ declare -ar FLAGS=(
   '-fomit-frame-pointer'
 )
 
-arm-linux-gnueabi-gcc "${FLAGS[@]}" -Wno-sign-conversion apf_interpreter.c -c -o apf_interpreter.arm.o
+arm-linux-gnueabi-gcc "${FLAGS[@]}" apf_interpreter.c -c -o apf_interpreter.arm.o
 clang -m32 "${FLAGS[@]}" -Wnullable-to-nonnull-conversion -Wthread-safety apf_interpreter.c -c -o apf_interpreter.x86.o
 size apf_interpreter.arm.o
 size apf_interpreter.x86.o
diff --git a/v5/apf_interpreter.c b/v5/apf_interpreter.c
index 16fce48..3bca784 100644
--- a/v5/apf_interpreter.c
+++ b/v5/apf_interpreter.c
@@ -405,7 +405,7 @@ FUNC(match_result_type apf_internal_match_single_name(const u8* needle,
             if (*ofs >= udp_len) return error_packet;
             u8 w = udp[(*ofs)++];
             if (*ofs > first_unread_offset) first_unread_offset = *ofs;
-            u32 new_ofs = (v - 0xC0) * 256 + w;
+            u32 new_ofs = (v - 0xC0) * 256u + w;
             if (new_ofs >= *ofs) return error_packet;  /* RFC 1035 4.1.4 allows only backward pointers */
             *ofs = new_ofs;
         } else if (v > 63) {
@@ -507,7 +507,7 @@ FUNC(match_result_type apf_internal_match_names(const u8* needles,
  */
 FUNC(u16 apf_internal_calc_csum(u32 sum, const u8* const buf, const s32 len)) {
     s32 i;
-    for (i = 0; i < len; ++i) sum += buf[i] * ((i & 1) ? 1 : 256);
+    for (i = 0; i < len; ++i) sum += buf[i] * ((i & 1) ? 1u : 256u);
 
     sum = (sum & 0xFFFF) + (sum >> 16);  /* max after this is 1FFFE */
     u16 csum = sum + (sum >> 16);