net/bridge/netfilter: move a dereference below a NULL test
In each case, if the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6c614a5020
commit
f3d8b2e467
|
@ -85,12 +85,13 @@ static inline int ebt_do_match (struct ebt_entry_match *m,
|
||||||
static inline int ebt_dev_check(char *entry, const struct net_device *device)
|
static inline int ebt_dev_check(char *entry, const struct net_device *device)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
const char *devname = device->name;
|
const char *devname;
|
||||||
|
|
||||||
if (*entry == '\0')
|
if (*entry == '\0')
|
||||||
return 0;
|
return 0;
|
||||||
if (!device)
|
if (!device)
|
||||||
return 1;
|
return 1;
|
||||||
|
devname = device->name;
|
||||||
/* 1 is the wildcard token */
|
/* 1 is the wildcard token */
|
||||||
while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i])
|
while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i])
|
||||||
i++;
|
i++;
|
||||||
|
|
Loading…
Reference in a new issue