criu/include
Kir Kolyshkin e49faff1ff fopen_proc(), opendir_proc(): don't print two errors
Both fopen_proc() and opendir_proc() are calling open_proc().
If open_proc() fails, it prints an error message. Before this
patch, a second error message was printed due to missing brackets.
This second message is a bit more specific (it tells the exact
file/dir we failed to open) but it is redundant, because more
generic error was already printed by open_proc(). It is also
can be misleading because for the second message we reuse
the same errno while we should not.

So, let's remove this second error message print by using brackets.

Alternatively, we could leave this as is (just fixing indentation)
and let two errors be printed -- there is nothing wrong with that,
but I think in this case less messages is better.

This is a fix to commit 5661d80.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
2013-11-21 13:40:35 +04:00
..
asm-generic asm: Add builtin_memcpy, builtin_memcmp generic helpers 2013-05-23 16:51:14 +04:00
bug.h shmem: don't include restorer.h in shmem.c 2013-11-06 12:38:43 +04:00
compiler.h include/compiler.h: Cleanup 2013-02-15 17:34:38 +04:00
cpu.h cpu: Make cpu routines being per-acrh 2013-02-18 18:42:08 +04:00
cr-service.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
cr-show.h headers: Add \Newline-s for readability sake 2013-11-15 17:00:14 +04:00
cr_options.h headers: Add missing __CR_ at last endif 2013-11-15 16:59:57 +04:00
crtools.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
err.h headers: Add err.h header 2013-04-02 20:27:51 +04:00
errno.h headers: Move ERESTART codes to errno.h 2013-11-14 22:22:21 +04:00
eventfd.h crtools: remove extra headers from headers 2013-11-06 18:17:45 +04:00
eventpoll.h crtools: remove extra headers from headers 2013-11-06 18:17:45 +04:00
fcntl.h headers: Move fcntl related data to include/fcntl.h 2013-11-14 22:13:10 +04:00
fdset.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
fifo.h collect: Shorten common images collecting code 2013-08-21 03:52:18 +04:00
file-ids.h headers: Change "../protobuf/" to "protobuf/" 2013-02-15 17:33:06 +04:00
file-lock.h crtools: don't include crtools.h in other headers 2013-11-06 18:17:38 +04:00
files-reg.h dump: Don't forget to cleanup link remap if needed 2013-11-01 13:36:07 +04:00
files.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
fsnotify.h crtools: remove extra headers from headers 2013-11-06 18:17:45 +04:00
image-desc.h net: Save and restore iptables in net namespace 2013-10-04 02:51:33 +04:00
image.h image: add dir parameter to open_image_dir() 2013-11-15 21:38:40 +04:00
inet_diag.h headers: Unify include guards (in comments) and a few fixes 2012-12-25 22:40:24 +04:00
ipc_ns.h crtools: don't include crtools.h in other headers 2013-11-06 18:17:38 +04:00
kcmp-ids.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
kcmp.h headers: Move kcmp_type to kcmp.h 2013-11-14 22:13:59 +04:00
kerndat.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
libnetlink.h headers: Unify include guards (in comments) and a few fixes 2012-12-25 22:40:24 +04:00
list.h headers: list.h -- Add hlist helpers 2013-04-02 20:29:25 +04:00
lock.h atomic: Use atomic_read instead of atomic_get 2013-08-16 19:37:06 +04:00
log-levels.h headers: Unify include guards (in comments) and a few fixes 2012-12-25 22:40:24 +04:00
log.h pidfile: Don't push opts.pidfile as write_pidfile arg 2013-11-20 14:26:41 +04:00
magic.h net: Save and restore iptables in net namespace 2013-10-04 02:51:33 +04:00
mem.h mem: Add PME_ bits for page frame retrieval 2013-05-23 12:51:27 +04:00
mman.h headers: Move MADV definitions to own mman.h 2013-11-14 22:48:30 +04:00
mount.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
namespaces.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
net.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
netfilter.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
netlink_diag.h headers: Add missing __CR_ at last endif 2013-11-15 16:59:57 +04:00
packet_diag.h headers: Unify include guards (in comments) and a few fixes 2012-12-25 22:40:24 +04:00
page-pipe.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
page-read.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
page-xfer.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
parasite-syscall.h headers: Add \Newline-s for readability sake 2013-11-15 17:00:14 +04:00
parasite.h crtools: include sys/time.h in parasite.h 2013-11-06 16:41:45 +04:00
pid.h headers: Add missing __CR_ at last endif 2013-11-15 16:59:57 +04:00
pipes.h collect: Shorten common images collecting code 2013-08-21 03:52:18 +04:00
posix-timer.h headers: Add missing __CR_ at last endif 2013-11-15 16:59:57 +04:00
prctl.h headers: Move prctl constants to prctl.h 2013-11-14 22:19:43 +04:00
proc_parse.h crtools: don't include restorer.h in proc_parse.h 2013-11-06 12:37:55 +04:00
protobuf-desc.h build: Generate most of the pb-desc automatically 2013-08-23 21:47:31 +04:00
protobuf.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
pstree.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
ptrace.h headers: ptrace.h -- Reflect name change in ifdef/endif 2013-11-15 17:00:28 +04:00
rbtree.h x86: moved x86-specific files into the directory arch/x86. 2013-01-09 17:02:47 +04:00
restorer.h rst: Rename task_restore_core_args 2013-11-08 17:32:07 +04:00
rst-malloc.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
rst_info.h headers: Add missing __CR_ at last endif 2013-11-15 16:59:57 +04:00
servicefd.h log: get rid of LOG_DIR_FD_OFF and opening cwd in log_init() 2013-11-15 21:38:41 +04:00
shmem.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
sigframe.h parasite: don't include restorer.h in parasite-syscall.c 2013-11-06 12:39:36 +04:00
signalfd.h show: Replace one-line show_foo calls with args array 2013-08-24 04:00:32 +04:00
sk-inet.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
sk-packet.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
sk-queue.h crtools: move all stuff about vma together 2013-11-06 12:43:49 +04:00
sockets.h crtools: remove extra headers from headers 2013-11-06 18:17:45 +04:00
stats.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
string.h Add strlcpy helper 2013-08-28 19:06:43 +04:00
syscall-types.h syscalls: Add proper syscalls definition. 2013-07-01 16:19:21 +04:00
sysctl.h headers: Unify include guards (in comments) and a few fixes 2012-12-25 22:40:24 +04:00
tty.h crtools: don't include crtools.h in other headers 2013-11-06 18:17:38 +04:00
tun.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
unix_diag.h x86: moved x86-specific files into the directory arch/x86. 2013-01-09 17:02:47 +04:00
util-pie.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
util.h fopen_proc(), opendir_proc(): don't print two errors 2013-11-21 13:40:35 +04:00
uts_ns.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
vdso.h vdso: Diet include/vdso.h 2013-06-13 19:41:09 +04:00
vma.h headers: Add extern specificator to functions 2013-11-15 17:00:58 +04:00
xmalloc.h headers: util.h -- Move memory helpers to xmalloc.h 2013-04-02 21:15:27 +04:00