]> err.no Git - linux-2.6/commitdiff
strlcpy is smart enough
authorJean Delvare <khali@linux-fr.org>
Tue, 27 Mar 2007 05:47:22 +0000 (21:47 -0800)
committerJeff Garzik <jeff@garzik.org>
Sat, 28 Apr 2007 15:01:02 +0000 (11:01 -0400)
strlcpy already accounts for the trailing zero in its length
computation, so there is no need to substract one to the buffer size.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Jan-Bernd Themann <themann@de.ibm.com>
Cc: Thomas Klein <osstklei@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/ehea/ehea_ethtool.c

index 9f57c2e78cedce2359a85a761ea363e7addab83f..19950273ceb903105480c3a9fe28734c5a471b32 100644 (file)
@@ -144,8 +144,8 @@ static int ehea_nway_reset(struct net_device *dev)
 static void ehea_get_drvinfo(struct net_device *dev,
                               struct ethtool_drvinfo *info)
 {
-       strlcpy(info->driver, DRV_NAME, sizeof(info->driver) - 1);
-       strlcpy(info->version, DRV_VERSION, sizeof(info->version) - 1);
+       strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
+       strlcpy(info->version, DRV_VERSION, sizeof(info->version));
 }
 
 static u32 ehea_get_msglevel(struct net_device *dev)