Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 10:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

atm: Replace custom isprint() with generic analogue

Browse Source 
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:
Andy Shevchenko 2021-05-10 17:49:09 +03:00 committed by David S. Miller
parent aed6864035
commit 532062b099
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/atm/iphase.c
View File

@ -47,6 +47,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/atm.h> #include <linux/atm.h>
#include <linux/atmdev.h> #include <linux/atmdev.h>
#include <linux/ctype.h>
#include <linux/sonet.h> #include <linux/sonet.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/time.h> #include <linux/time.h>
@ -996,10 +997,12 @@ static void xdump( u_char* cp, int length, char* prefix )
} }
pBuf += sprintf( pBuf, " " ); pBuf += sprintf( pBuf, " " );
for(col = 0;count + col < length && col < 16; col++){ for(col = 0;count + col < length && col < 16; col++){
if (isprint((int)cp[count + col])) u_char c = cp[count + col];
pBuf += sprintf( pBuf, "%c", cp[count + col] );
else if (isascii(c) && isprint(c))
pBuf += sprintf( pBuf, "." ); pBuf += sprintf(pBuf, "%c", c);
else
pBuf += sprintf(pBuf, ".");
} }
printk("%s\n", prntBuf); printk("%s\n", prntBuf);
count += col; count += col;

1
drivers/atm/iphase.h
View File

@ -124,7 +124,6 @@
#define IF_RXPKT(A) #define IF_RXPKT(A)
#endif /* CONFIG_ATM_IA_DEBUG */ #endif /* CONFIG_ATM_IA_DEBUG */
#define isprint(a) ((a >=' ')&&(a <= '~'))
#define ATM_DESC(skb) (skb->protocol) #define ATM_DESC(skb) (skb->protocol)
#define IA_SKB_STATE(skb) (skb->protocol) #define IA_SKB_STATE(skb) (skb->protocol)
#define IA_DLED 1 #define IA_DLED 1