From fadce6caf57986dc941e5fe3c860998890d49fd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 7 Mar 2015 13:54:32 -0500 Subject: [PATCH] v4l_id: use standard option parsing loop Not terribly important, but the loop wasn't an actual loop, making coverity unhappy. CID #1261725. --- src/udev/v4l_id/v4l_id.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c index 0ebe43463..5c57db44c 100644 --- a/src/udev/v4l_id/v4l_id.c +++ b/src/udev/v4l_id/v4l_id.c @@ -36,29 +36,28 @@ int main(int argc, char *argv[]) { _cleanup_close_ int fd = -1; char *device; struct v4l2_capability v2cap; + int c; - for (;;) { - int option; + while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) - option = getopt_long(argc, argv, "h", options, NULL); - if (option == -1) - break; - - switch (option) { + switch (c) { case 'h': printf("%s [-h,--help] \n\n" "Video4Linux device identification.\n\n" " -h Print this message\n" , program_invocation_short_name); return 0; + case '?': + return -EINVAL; + default: - return 1; + assert_not_reached("Unhandled option"); } - } - device = argv[optind]; + device = argv[optind]; if (device == NULL) return 2; + fd = open(device, O_RDONLY); if (fd < 0) return 3; -- 2.30.2