diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-07-17 08:52:08 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-21 20:27:08 -0300 |
commit | de8eae36057b50086278af1ec4d96fc9a2e35f0b (patch) | |
tree | a8bb6d6297606bdaa5b2f3e68e26ef88468d11d9 /drivers/media/media-device.c | |
parent | 62ea864f84fed6e04dd033d500d4c9183a83d590 (diff) |
[media] media: Use strlcpy instead of custom code
Replace strncpy + manually setting the terminating '\0' with an strlcpy
call.
Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/media-device.c')
-rw-r--r-- | drivers/media/media-device.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 73a432934bd8..7b39440192d6 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -103,10 +103,8 @@ static long media_device_enum_entities(struct media_device *mdev, return -EINVAL; u_ent.id = ent->id; - if (ent->name) { - strncpy(u_ent.name, ent->name, sizeof(u_ent.name)); - u_ent.name[sizeof(u_ent.name) - 1] = '\0'; - } + if (ent->name) + strlcpy(u_ent.name, ent->name, sizeof(u_ent.name)); u_ent.type = ent->type; u_ent.revision = ent->revision; u_ent.flags = ent->flags; |