lkml.org 
[lkml]   [2010]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 15/25] drivers/net/wireless/ipw2x00: Use static const char arrays
    On Mon, Sep 13, 2010 at 12:47:53PM -0700, Joe Perches wrote:
    > Signed-off-by: Joe Perches <joe@perches.com>
    > ---
    > drivers/net/wireless/ipw2x00/ipw2100.c | 2 +-
    > drivers/net/wireless/ipw2x00/ipw2200.c | 2 +-
    > drivers/net/wireless/ipw2x00/libipw_module.c | 2 +-
    > 3 files changed, 3 insertions(+), 3 deletions(-)
    >
    > diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
    > index 61915f3..f64103c 100644
    > --- a/drivers/net/wireless/ipw2x00/ipw2100.c
    > +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
    > @@ -4261,7 +4261,7 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
    > {
    > struct ipw2100_priv *priv = dev_get_drvdata(d);
    > struct net_device *dev = priv->net_dev;
    > - char buffer[] = "00000000";
    > + char buffer[sizeof("00000000")];
    > unsigned long len =
    > (sizeof(buffer) - 1) > count ? count : sizeof(buffer) - 1;
    > unsigned long val;

    Had to look twice, since you replaced an initialization with a
    declaration. But in all these cases the initial value was already
    being overwritten before use anyway.

    Acked-by: John W. Linville <linville@tuxdriver.com>

    > diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
    > index 0f25083..75e83c9 100644
    > --- a/drivers/net/wireless/ipw2x00/ipw2200.c
    > +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
    > @@ -1486,7 +1486,7 @@ static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
    > {
    > struct ipw_priv *priv = dev_get_drvdata(d);
    > struct net_device *dev = priv->net_dev;
    > - char buffer[] = "00000000";
    > + char buffer[sizeof("00000000")];
    > unsigned long len =
    > (sizeof(buffer) - 1) > count ? count : sizeof(buffer) - 1;
    > unsigned long val;
    > diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
    > index 32dee2c..d0c8a67 100644
    > --- a/drivers/net/wireless/ipw2x00/libipw_module.c
    > +++ b/drivers/net/wireless/ipw2x00/libipw_module.c
    > @@ -261,7 +261,7 @@ static int debug_level_proc_open(struct inode *inode, struct file *file)
    > static ssize_t debug_level_proc_write(struct file *file,
    > const char __user *buffer, size_t count, loff_t *pos)
    > {
    > - char buf[] = "0x00000000\n";
    > + char buf[sizeof("0x00000000\n")];
    > size_t len = min(sizeof(buf) - 1, count);
    > unsigned long val;
    >
    > --
    > 1.7.3.rc1
    >
    >

    --
    John W. Linville Someday the world will need a hero, and you
    linville@tuxdriver.com might be all we have. Be ready.


    \
     
     \ /
      Last update: 2010-09-14 20:47    [W:0.026 / U:61.788 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site