[CRIU] [PATCH 8/8] protobuf: cast the result of the macro pb_repeated_size to size_t

Alexander Kartashov alekskartashov at parallels.com
Fri Jan 18 02:08:39 EST 2013


Signed-off-by: Alexander Kartashov <alekskartashov at parallels.com>
---
 include/protobuf.h |    2 +-
 sk-inet.c          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/protobuf.h b/include/protobuf.h
index 5666c01..cf3ef6d 100644
--- a/include/protobuf.h
+++ b/include/protobuf.h
@@ -78,7 +78,7 @@ extern int pb_write_one(int fd, void *obj, int type);
 	(__proto_message_name ##__get_packed_size(__obj) + sizeof(u32))
 
 #define pb_repeated_size(__obj, __member)						\
-	(sizeof(*(__obj)->__member) * (__obj)->n_ ##__member)
+	((size_t)(sizeof(*(__obj)->__member) * (__obj)->n_ ##__member))
 
 #define pb_msg(__base, __type)			\
 	container_of(__base, __type, base)
diff --git a/sk-inet.c b/sk-inet.c
index f8b47c0..66366ac 100644
--- a/sk-inet.c
+++ b/sk-inet.c
@@ -425,7 +425,7 @@ static int inet_validate_address(InetSkEntry *ie)
 			(ie->n_dst_addr == PB_ALEN_INET6))
 		return 0;
 
-	pr_err("Addr len mismatch f %d ss %lu ds %lu\n", ie->family,
+	pr_err("Addr len mismatch f %d ss %zu ds %zu\n", ie->family,
 			pb_repeated_size(ie, src_addr),
 			pb_repeated_size(ie, dst_addr));
 
-- 
1.7.10.4



More information about the CRIU mailing list