summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2007-03-26 21:47:22 -0800
committerJeff Garzik <jeff@garzik.org>2007-04-28 11:01:02 -0400
commit4eccccb36223be5271b550a9ba4722a1e72c9312 (patch)
tree44b7d58a74f878a150dfab8dde7428239f168c43
parenta3fa3aba7a0e00aa1cbb13c9e9bed162fa057973 (diff)
downloadop-kernel-dev-4eccccb36223be5271b550a9ba4722a1e72c9312.zip
op-kernel-dev-4eccccb36223be5271b550a9ba4722a1e72c9312.tar.gz
strlcpy is smart enough
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>
-rw-r--r--drivers/net/ehea/ehea_ethtool.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index 9f57c2e..1995027 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -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)
OpenPOWER on IntegriCloud