diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-04-17 14:15:24 -0700 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2020-04-20 14:40:14 +0200 |
| commit | ce8ed12c95eeb628febfff04abe9fae4d6f410bf (patch) | |
| tree | 698d0ccf0dbbc229d1410b2842c5b30ae6ef421a /utils/v4l2-ctl/v4l2-ctl-streaming.cpp | |
| parent | 06dc2b0c0e9705d5d4607c89dfc7decf714a68d6 (diff) | |
treewide: do not use return after else
Found with clang-tidy's readability-else-after-return
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: split '} if () {' into two lines]
[hverkuil-cisco@xs4all.nl: split 'if () continue; else return -1;' into two lines]
Diffstat (limited to 'utils/v4l2-ctl/v4l2-ctl-streaming.cpp')
| -rw-r--r-- | utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp index 00affd1a..d9a307f9 100644 --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp @@ -2490,7 +2490,8 @@ static void stateless_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out, if (rc == 0) { fprintf(stderr, "Timeout when waiting for media request\n"); return; - } else if (rc < 0) { + } + if (rc < 0) { fprintf(stderr, "Unable to select media request: %s\n", strerror(errno)); return; @@ -2654,7 +2655,8 @@ static void streaming_set_cap2out(cv4l_fd &fd, cv4l_fd &out_fd) V4L2_CAP_VIDEO_M2M_MPLANE))) { fprintf(stderr, "unsupported capture stream type\n"); return; - } else if (!(out_capabilities & (V4L2_CAP_VIDEO_OUTPUT | + } + if (!(out_capabilities & (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE))) { |