Commit 532062b0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

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: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aed68640

drivers/atm/iphase.c

+7 −4
Original line number Diff line number Diff line
@@ -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,8 +997,10 @@ 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] );

		u_char c = cp[count + col];



		if (isascii(c) && isprint(c))

			pBuf += sprintf(pBuf, "%c", c);

		else

			pBuf += sprintf(pBuf, ".");

                }

drivers/atm/iphase.h

+0 −1
Original line number Diff line number Diff line
@@ -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