Commit 8e18d1f9 authored by Tobias Klauser's avatar Tobias Klauser Committed by Jeff Garzik
Browse files

[PATCH] Replace drivers/net/wan custom ctype macros with standard ones 



Replace the custom is_digit()/is_hex_digit() macros with
isdigit()/isxdigit() from <linux/ctype.h> Additionaly remove unused macro
is_alpha() from <linux/wanpipe.h>

Signed-off-by: default avatarTobias Klauser <tklauser@nuerscht.ch>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 3173c890

drivers/net/wan/cycx_x25.c

+3 −2
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 


#define CYCLOMX_X25_DEBUG 1



#include <linux/ctype.h>	/* isdigit() */

#include <linux/errno.h>	/* return codes */

#include <linux/if_arp.h>       /* ARPHRD_HWX25 */

#include <linux/kernel.h>	/* printk(), and other useful stuff */
@@ -418,7 +419,7 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev, 


		/* Set channel timeouts (default if not specified) */

		chan->idle_tmout = conf->idle_timeout ? conf->idle_timeout : 90;

	} else if (is_digit(conf->addr[0])) {	/* PVC */

	} else if (isdigit(conf->addr[0])) {	/* PVC */

		s16 lcn = dec_to_uint(conf->addr, 0);



		if (lcn >= card->u.x.lo_pvc && lcn <= card->u.x.hi_pvc)
@@ -1531,7 +1532,7 @@ static unsigned dec_to_uint(u8 *str, int len) 
	if (!len)

		len = strlen(str);



	for (; len && is_digit(*str); ++str, --len)

	for (; len && isdigit(*str); ++str, --len)

		val = (val * 10) + (*str - (unsigned) '0');



	return val;

drivers/net/wan/sdla_fr.c

+2 −2
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ static int new_if(struct wan_device* wandev, struct net_device* dev, 
	chan->card = card;



	/* verify media address */

	if (is_digit(conf->addr[0])) {

	if (isdigit(conf->addr[0])) {



		dlci = dec_to_uint(conf->addr, 0);
@@ -3456,7 +3456,7 @@ static unsigned int dec_to_uint (unsigned char* str, int len) 
	if (!len) 

		len = strlen(str);



	for (val = 0; len && is_digit(*str); ++str, --len)

	for (val = 0; len && isdigit(*str); ++str, --len)

		val = (val * 10) + (*str - (unsigned)'0');



	return val;

drivers/net/wan/sdla_x25.c

+4 −4
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static int new_if(struct wan_device* wandev, struct net_device* dev, 
		chan->hold_timeout = (conf->hold_timeout) ? 

					conf->hold_timeout : 10;



	}else if (is_digit(conf->addr[0])){	/* PVC */

	}else if (isdigit(conf->addr[0])){	/* PVC */

		int lcn = dec_to_uint(conf->addr, 0);



		if ((lcn >= card->u.x.lo_pvc) && (lcn <= card->u.x.hi_pvc)){
@@ -3875,7 +3875,7 @@ static unsigned int dec_to_uint (unsigned char* str, int len) 
	if (!len) 

		len = strlen(str);



	for (val = 0; len && is_digit(*str); ++str, --len)

	for (val = 0; len && isdigit(*str); ++str, --len)

		val = (val * 10) + (*str - (unsigned)'0');

	

	return val;
@@ -3896,9 +3896,9 @@ static unsigned int hex_to_uint (unsigned char* str, int len) 
	for (val = 0; len; ++str, --len)

	{

		ch = *str;

		if (is_digit(ch))

		if (isdigit(ch))

			val = (val << 4) + (ch - (unsigned)'0');

		else if (is_hex_digit(ch))

		else if (isxdigit(ch))

			val = (val << 4) + ((ch & 0xDF) - (unsigned)'A' + 10);

		else break;

	}

include/linux/cyclomx.h

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
#include <linux/cycx_x25.h>

#endif



#define	is_digit(ch) (((ch)>=(unsigned)'0'&&(ch)<=(unsigned)'9')?1:0)



/* Adapter Data Space.

 * This structure is needed because we handle multiple cards, otherwise

 * static data would do it.

include/linux/wanpipe.h

+0 −9
Original line number Diff line number Diff line
@@ -265,15 +265,6 @@ typedef struct { 
#include <linux/tty_driver.h>

#include <linux/tty_flip.h>





#define	is_digit(ch) (((ch)>=(unsigned)'0'&&(ch)<=(unsigned)'9')?1:0)

#define	is_alpha(ch) ((((ch)>=(unsigned)'a'&&(ch)<=(unsigned)'z')||\

	 	  ((ch)>=(unsigned)'A'&&(ch)<=(unsigned)'Z'))?1:0)

#define	is_hex_digit(ch) ((((ch)>=(unsigned)'0'&&(ch)<=(unsigned)'9')||\

	 	  ((ch)>=(unsigned)'a'&&(ch)<=(unsigned)'f')||\

	 	  ((ch)>=(unsigned)'A'&&(ch)<=(unsigned)'F'))?1:0)





/****** Data Structures *****************************************************/



/* Adapter Data Space.

CRA Git | Maintained and supported by SUSTech CRA and CCSE