[PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat

Ian Abbott abbotti at mev.co.uk
Mon Oct 13 09:14:34 UTC 2014


On 12/10/14 13:23, Rickard Strandqvist wrote:
> Changed from using strncat to strlcat to simplify the code
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist at spectrumdigital.se>
> ---
>   drivers/staging/comedi/drivers/comedi_bond.c |    6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
> index 8450c99..5d19861 100644
> --- a/drivers/staging/comedi/drivers/comedi_bond.c
> +++ b/drivers/staging/comedi/drivers/comedi_bond.c
> @@ -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));
>   			}
>
>   		}
>

Looks good.  Additionally, the #define MAX_BOARD_NAME could be 
eliminated as now it is only used to to set the length of the 'name' 
member in 'struct comedi_bond_private'.

Reviewed-by: Ian Abbott <abbotti at mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti at mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-


More information about the devel mailing list