forked from Minki/linux
atm: Replace custom isprint() with generic analogue
Custom isprint() definition may collide with one form ctype.h. In order to avoid this, replace it with a functional analogue which is isascii() && isprint() in this case. First appearance of the code is in the commit 636b38438001 ("Import 2.3.43"). Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
aed6864035
commit
532062b099
@ -47,6 +47,7 @@
|
||||
#include <linux/errno.h>
|
||||
#include <linux/atm.h>
|
||||
#include <linux/atmdev.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/sonet.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/time.h>
|
||||
@ -996,10 +997,12 @@ static void xdump( u_char* cp, int length, char* prefix )
|
||||
}
|
||||
pBuf += sprintf( pBuf, " " );
|
||||
for(col = 0;count + col < length && col < 16; col++){
|
||||
if (isprint((int)cp[count + col]))
|
||||
pBuf += sprintf( pBuf, "%c", cp[count + col] );
|
||||
else
|
||||
pBuf += sprintf( pBuf, "." );
|
||||
u_char c = cp[count + col];
|
||||
|
||||
if (isascii(c) && isprint(c))
|
||||
pBuf += sprintf(pBuf, "%c", c);
|
||||
else
|
||||
pBuf += sprintf(pBuf, ".");
|
||||
}
|
||||
printk("%s\n", prntBuf);
|
||||
count += col;
|
||||
|
@ -124,7 +124,6 @@
|
||||
#define IF_RXPKT(A)
|
||||
#endif /* CONFIG_ATM_IA_DEBUG */
|
||||
|
||||
#define isprint(a) ((a >=' ')&&(a <= '~'))
|
||||
#define ATM_DESC(skb) (skb->protocol)
|
||||
#define IA_SKB_STATE(skb) (skb->protocol)
|
||||
#define IA_DLED 1
|
||||
|
Loading…
Reference in New Issue
Block a user