Prevent accidentally passing an integer value to IP_ARGS.

diff --git a/lib/packets.h b/lib/packets.h
index bad36712d3fb96af550e156a65bfd2c3d7cd99b6..09ee05dc84a4bff2902e65b290eb489036dfe6c4 100644 (file)
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -160,9 +160,13 @@ struct vlan_eth_header {
 } __attribute__((packed));
 BUILD_ASSERT_DECL(VLAN_ETH_HEADER_LEN == sizeof(struct vlan_eth_header));
 
+/* The "(void) (ip)[0]" below has no effect on the value, since it's the first
+ * argument of a comma expression, but it makes sure that 'ip' is a pointer.
+ * This is useful since a common mistake is to pass an integer instead of a
+ * pointer to IP_ARGS. */
 #define IP_FMT "%"PRIu8".%"PRIu8".%"PRIu8".%"PRIu8
 #define IP_ARGS(ip)                             \
-        ((uint8_t *) ip)[0],                    \
+        ((void) (ip)[0], ((uint8_t *) ip)[0]),  \
         ((uint8_t *) ip)[1],                    \
         ((uint8_t *) ip)[2],                    \
         ((uint8_t *) ip)[3]