staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat
authorRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Sun, 12 Oct 2014 12:23:24 +0000 (14:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 07:47:11 +0000 (15:47 +0800)
Changed from using strncat to strlcat to simplify the code

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/comedi_bond.c

index 8450c99..5d19861 100644 (file)
@@ -262,12 +262,10 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
                        {
                                /* Append dev:subdev to devpriv->name */
                                char buf[20];
-                               int left =
-                                   MAX_BOARD_NAME - strlen(devpriv->name) - 1;
                                snprintf(buf, sizeof(buf), "%u:%u ",
                                         bdev->minor, bdev->subdev);
-                               buf[sizeof(buf) - 1] = 0;
-                               strncat(devpriv->name, buf, left);
+                               strlcat(devpriv->name, buf,
+                                       sizeof(devpriv->name));
                        }
 
                }