mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +00:00
e1000e: convert final strncpy() to strlcpy()
Convert the last instances of strncpy() to the preferred strlcpy(). Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
434f1392ae
commit
f2315bf1d1
@ -5947,7 +5947,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
|
||||
ret_val = e1000_read_pba_string_generic(hw, pba_str,
|
||||
E1000_PBANUM_LENGTH);
|
||||
if (ret_val)
|
||||
strncpy((char *)pba_str, "Unknown", sizeof(pba_str) - 1);
|
||||
strlcpy((char *)pba_str, "Unknown", sizeof(pba_str));
|
||||
e_info("MAC: %d, PHY: %d, PBA No: %s\n",
|
||||
hw->mac.type, hw->phy.type, pba_str);
|
||||
}
|
||||
@ -6139,7 +6139,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
|
||||
e1000e_set_ethtool_ops(netdev);
|
||||
netdev->watchdog_timeo = 5 * HZ;
|
||||
netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
|
||||
strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
|
||||
strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));
|
||||
|
||||
netdev->mem_start = mmio_start;
|
||||
netdev->mem_end = mmio_start + mmio_len;
|
||||
@ -6321,7 +6321,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
|
||||
if (!(adapter->flags & FLAG_HAS_AMT))
|
||||
e1000e_get_hw_control(adapter);
|
||||
|
||||
strncpy(netdev->name, "eth%d", sizeof(netdev->name) - 1);
|
||||
strlcpy(netdev->name, "eth%d", sizeof(netdev->name));
|
||||
err = register_netdev(netdev);
|
||||
if (err)
|
||||
goto err_register;
|
||||
|
Loading…
Reference in New Issue
Block a user