mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 07:15:31 +00:00
Code Issues Releases Wiki Activity

img: Don't return fd, return -1 instead

Browse Source 
The same -- int-fd will soon go away, so return the
explicit int -1 instead of it.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Pavel Emelyanov
2014-09-29 12:48:10 +04:00
parent 42821edccf
commit 35be2ee262
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cgroup.c
View File

@@ -1308,7 +1308,7 @@ int prepare_cgroup(void)
if (errno == ENOENT) /* backward compatibility */ if (errno == ENOENT) /* backward compatibility */
return 0; return 0;
else else
return fd; return -1;
} }
ret = pb_read_one_eof(fd, &ce, PB_CGROUP); ret = pb_read_one_eof(fd, &ce, PB_CGROUP);

6
cr-restore.c
View File

@@ -1984,7 +1984,7 @@ static int prepare_itimers_from_fd(int pid, struct task_restore_args *args)
fd = open_image(CR_FD_ITIMERS, O_RSTR, pid); fd = open_image(CR_FD_ITIMERS, O_RSTR, pid);
if (fd < 0) if (fd < 0)
return fd; return -1;
ret = pb_read_one(fd, &ie, PB_ITIMER); ret = pb_read_one(fd, &ie, PB_ITIMER);
if (ret < 0) if (ret < 0)
@@ -2109,7 +2109,7 @@ static int prepare_posix_timers_from_fd(int pid)
if (errno == ENOENT) /* backward compatibility */ if (errno == ENOENT) /* backward compatibility */
return 0; return 0;
else else
return fd; return -1;
} }
while (1) { while (1) {
@@ -2178,7 +2178,7 @@ static int prepare_creds(int pid, struct task_restore_args *args)
fd = open_image(CR_FD_CREDS, O_RSTR, pid); fd = open_image(CR_FD_CREDS, O_RSTR, pid);
if (fd < 0) if (fd < 0)
return fd; return -1;
ret = pb_read_one(fd, &ce, PB_CREDS); ret = pb_read_one(fd, &ce, PB_CREDS);
close_safe(&fd); close_safe(&fd);

2
pstree.c
View File

@@ -325,7 +325,7 @@ static int read_pstree_image(void)
ps_fd = open_image(CR_FD_PSTREE, O_RSTR); ps_fd = open_image(CR_FD_PSTREE, O_RSTR);
if (ps_fd < 0) if (ps_fd < 0)
return ps_fd; return -1;
while (1) { while (1) {
PstreeEntry *e; PstreeEntry *e;