Commit d6d034a9 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Pavel Emelyanov

Use rlim_t where appropriate

I got the following then trying to compile CRIU on ARM with clang:

> criu/cr-restore.c:2476:22: error: implicit conversion from 'unsigned
> long long' to 'unsigned long' changes value from 18446744073709551615 to
> 4294967295 [-Werror,-Wconstant-conversion]
>         return ival == -1 ? RLIM_INFINITY : ival;
>         ~~~~~~              ^~~~~~~~~~~~~
> /usr/include/arm-linux-gnueabihf/bits/resource.h:117:24: note: expanded
> from macro 'RLIM_INFINITY'
> # define RLIM_INFINITY 0xffffffffffffffffuLL
>                        ^~~~~~~~~~~~~~~~~~~~~
> 1 error generated.

Fix by using provided rlim_t type in this and similar places.

travis-ci: success for Fixes to compile on arm with clang
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 70e3b465
...@@ -309,7 +309,7 @@ static int dump_task_fs(pid_t pid, struct parasite_dump_misc *misc, struct cr_im ...@@ -309,7 +309,7 @@ static int dump_task_fs(pid_t pid, struct parasite_dump_misc *misc, struct cr_im
return pb_write_one(img_from_set(imgset, CR_FD_FS), &fe, PB_FS); return pb_write_one(img_from_set(imgset, CR_FD_FS), &fe, PB_FS);
} }
static inline u_int64_t encode_rlim(unsigned long val) static inline rlim_t encode_rlim(rlim_t val)
{ {
return val == RLIM_INFINITY ? -1 : val; return val == RLIM_INFINITY ? -1 : val;
} }
......
...@@ -2352,7 +2352,7 @@ static int prep_sched_info(struct rst_sched_param *sp, ThreadCoreEntry *tc) ...@@ -2352,7 +2352,7 @@ static int prep_sched_info(struct rst_sched_param *sp, ThreadCoreEntry *tc)
return 0; return 0;
} }
static unsigned long decode_rlim(u_int64_t ival) static rlim_t decode_rlim(rlim_t ival)
{ {
return ival == -1 ? RLIM_INFINITY : ival; return ival == -1 ? RLIM_INFINITY : ival;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment