Code Review
/
apps
/
camera-gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix code review comments from https://gerrit.automotivelinux.org/gerrit/c/apps/camera...
[apps/camera-gstreamer.git]
/
app
/
utils.cpp
diff --git
a/app/utils.cpp
b/app/utils.cpp
index
1cf71f2
..
45fd4d7
100644
(file)
--- a/
app/utils.cpp
+++ b/
app/utils.cpp
@@
-156,7
+156,7
@@
os_create_anonymous_file(off_t size)
}
const char*
}
const char*
-get_camera_device(void)
+get_
first_
camera_device(void)
{
DIR *dir = opendir("/dev");
if (!dir) {
{
DIR *dir = opendir("/dev");
if (!dir) {
@@
-165,20
+165,22
@@
get_camera_device(void)
}
static char device[PATH_MAX];
}
static char device[PATH_MAX];
+ struct dirent *dirent;
bool found = false;
bool found = false;
- while (struct dirent *dirent = readdir(dir)) {
- if (strncmp(dirent->d_name, "video", strlen("video")))
+ while ((dirent = readdir(dir)) != NULL) {
+ struct v4l2_capability vid_cap;
+ int fd;
+
+ if (strcmp(dirent->d_name, "video"))
continue;
continue;
- if (!isdigit(dirent->d_name[
strlen("video")
]))
+ if (!isdigit(dirent->d_name[
5
]))
continue;
continue;
- strcpy(device, "/dev/");
- strncat(device, dirent->d_name, sizeof(device) - 1);
+ snprintf(device, sizeof(device), "/dev/%s", dirent->d_name);
-
int
fd = open(device, O_RDWR);
+ fd = open(device, O_RDWR);
if (fd == -1)
continue;
if (fd == -1)
continue;
- struct v4l2_capability vid_cap;
if (ioctl(fd, VIDIOC_QUERYCAP, &vid_cap) < 0) {
close(fd);
continue;
if (ioctl(fd, VIDIOC_QUERYCAP, &vid_cap) < 0) {
close(fd);
continue;