* [PATCH 1/2] netdev: use const for some name functions
@ 2008-09-23 15:39 Stephen Hemminger
2008-09-30 9:22 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2008-09-23 15:39 UTC (permalink / raw)
To: David Miller; +Cc: netdev
dev_change_name and netdev_drivername should use const char on parameters
that are read-only input values. The strcpy to newname is not needed since
newname is not used later in function.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/include/linux/netdevice.h 2008-09-23 08:29:15.000000000 -0700
+++ b/include/linux/netdevice.h 2008-09-23 08:29:16.000000000 -0700
@@ -1225,7 +1225,7 @@ extern int dev_ioctl(struct net *net, u
extern int dev_ethtool(struct net *net, struct ifreq *);
extern unsigned dev_get_flags(const struct net_device *);
extern int dev_change_flags(struct net_device *, unsigned);
-extern int dev_change_name(struct net_device *, char *);
+extern int dev_change_name(struct net_device *, const char *);
extern int dev_set_alias(struct net_device *, const char *, size_t);
extern int dev_change_net_namespace(struct net_device *,
struct net *, const char *);
@@ -1670,7 +1670,7 @@ extern void dev_seq_stop(struct seq_file
extern int netdev_class_create_file(struct class_attribute *class_attr);
extern void netdev_class_remove_file(struct class_attribute *class_attr);
-extern char *netdev_drivername(struct net_device *dev, char *buffer, int len);
+extern char *netdev_drivername(const struct net_device *dev, char *buffer, int len);
extern void linkwatch_run_queue(void);
--- a/net/core/dev.c 2008-09-23 08:29:15.000000000 -0700
+++ b/net/core/dev.c 2008-09-23 08:32:48.000000000 -0700
@@ -890,7 +890,7 @@ int dev_alloc_name(struct net_device *de
* Change name of a device, can pass format strings "eth%d".
* for wildcarding.
*/
-int dev_change_name(struct net_device *dev, char *newname)
+int dev_change_name(struct net_device *dev, const char *newname)
{
char oldname[IFNAMSIZ];
int err = 0;
@@ -916,7 +916,6 @@ int dev_change_name(struct net_device *d
err = dev_alloc_name(dev, newname);
if (err < 0)
return err;
- strcpy(newname, dev->name);
}
else if (__dev_get_by_name(net, newname))
return -EEXIST;
@@ -4746,10 +4745,10 @@ err_name:
return -ENOMEM;
}
-char *netdev_drivername(struct net_device *dev, char *buffer, int len)
+char *netdev_drivername(const struct net_device *dev, char *buffer, int len)
{
- struct device_driver *driver;
- struct device *parent;
+ const struct device_driver *driver;
+ const struct device *parent;
if (len <= 0 || !buffer)
return buffer;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] netdev: use const for some name functions
2008-09-23 15:39 [PATCH 1/2] netdev: use const for some name functions Stephen Hemminger
@ 2008-09-30 9:22 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-09-30 9:22 UTC (permalink / raw)
To: shemminger; +Cc: netdev
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 23 Sep 2008 08:39:34 -0700
> dev_change_name and netdev_drivername should use const char on parameters
> that are read-only input values. The strcpy to newname is not needed since
> newname is not used later in function.
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-09-30 9:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-23 15:39 [PATCH 1/2] netdev: use const for some name functions Stephen Hemminger
2008-09-30 9:22 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).