diff options
| author | Hans Verkuil | 2009-01-17 15:26:59 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2009-03-30 17:42:22 +0200 |
| commit | b634a93f783dbd4be31f3cc9b2292eddfb496d10 (patch) | |
| tree | d60edacfdd3c54269b780f901da33ff30e797f78 | |
| parent | V4L/DVB (10242): pwc: add support for webcam snapshot button (diff) | |
| download | kernel-qcow2-linux-b634a93f783dbd4be31f3cc9b2292eddfb496d10.tar.gz kernel-qcow2-linux-b634a93f783dbd4be31f3cc9b2292eddfb496d10.tar.xz kernel-qcow2-linux-b634a93f783dbd4be31f3cc9b2292eddfb496d10.zip | |
V4L/DVB (10244): v4l2: replace a few snprintfs with strlcpy
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/v4l2-common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index b8f2be8d5c0e..0f450a73477a 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c @@ -555,7 +555,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste qctrl->step = step; qctrl->default_value = def; qctrl->reserved[0] = qctrl->reserved[1] = 0; - snprintf(qctrl->name, sizeof(qctrl->name), name); + strlcpy(qctrl->name, name, sizeof(qctrl->name)); return 0; } EXPORT_SYMBOL(v4l2_ctrl_query_fill); @@ -720,7 +720,7 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qc for (i = 0; i < qmenu->index && menu_items[i]; i++) ; if (menu_items[i] == NULL || menu_items[i][0] == '\0') return -EINVAL; - snprintf(qmenu->name, sizeof(qmenu->name), menu_items[qmenu->index]); + strlcpy(qmenu->name, menu_items[qmenu->index], sizeof(qmenu->name)); return 0; } EXPORT_SYMBOL(v4l2_ctrl_query_menu); @@ -737,8 +737,8 @@ int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *id return -EINVAL; while (*ids != V4L2_CTRL_MENU_IDS_END) { if (*ids++ == qmenu->index) { - snprintf(qmenu->name, sizeof(qmenu->name), - menu_items[qmenu->index]); + strlcpy(qmenu->name, menu_items[qmenu->index], + sizeof(qmenu->name)); return 0; } } |