Re: [PATCHv2 1/2] drivers: isdn: get rid of custom strtoul()

Re: [PATCHv2 1/2] drivers: isdn: get rid of custom strtoul()

[Tilman Schmidt]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 2010-02-23 20:21 schrieb Andy Shevchenko:
> --- a/drivers/isdn/gigaset/ev-layer.c
> +++ b/drivers/isdn/gigaset/ev-layer.c
> @@ -420,64 +420,18 @@ static const struct zsau_resp_t {
>  	{NULL,				ZSAU_UNKNOWN}
>  };
>  
> -/*
> - * Get integer from char-pointer
> - */
> -static int isdn_getnum(char *p)
> -{
> -	int v = -1;
> -
> -	gig_dbg(DEBUG_TRANSCMD, "string: %s", p);

This conflicts (trivially) with:
[PATCH 3/4] gigaset: reduce syslog clutter
which I submitted the day before yesterday and which has not yet been
merged into *-next.

> -/*
> - * Get integer from char-pointer
> - */
> -static int isdn_gethex(char *p)
> -{
> -	int v = 0;
> -	int c;
> -
> -	gig_dbg(DEBUG_TRANSCMD, "string: %s", p);

Idem.

>  /* retrieve CID from parsed response
>   * returns 0 if no CID, -1 if invalid CID, or CID value 1..65535
>   */
>  static int cid_of_response(char *s)
>  {
>  	int cid;
> +	int rc;
>  
>  	if (s[-1] != ';')
>  		return 0;	/* no CID separator */
> -	cid = isdn_getnum(s);
> -	if (cid < 0)
> +	rc = strict_strtoul(s, 10, &cid);

strict_strtoul() expects unsigned long* as its third argument, but cid
is an int. Consequently, this generates sparse warnings:

drivers/isdn/gigaset/ev-layer.c:433:30: warning: incorrect type in
argument 3 (different type sizes)
drivers/isdn/gigaset/ev-layer.c:433:30:    expected unsigned long *<noident>
drivers/isdn/gigaset/ev-layer.c:433:30:    got int *<noident>

and compiler warnings:

drivers/isdn/gigaset/ev-layer.c: In function ‘cid_of_response’:
drivers/isdn/gigaset/ev-layer.c:433: warning: passing argument 3 of
‘strict_strtoul’ from incompatible pointer type
include/linux/kernel.h:176: note: expected ‘long unsigned int *’ but
argument is of type ‘int *’

> @@ -648,9 +602,11 @@ void gigaset_handle_modem_response(struct cardstate *cs)
>  		case RT_ZCAU:
>  			event->parameter = -1;
>  			if (curarg + 1 < params) {
> -				i = isdn_gethex(argv[curarg]);
> -				j = isdn_gethex(argv[curarg + 1]);
> -				if (i >= 0 && i < 256 && j >= 0 && j < 256)
> +				int ri = strict_strtoul(argv[curarg], 16, &i);
> +				int rj = strict_strtoul(argv[curarg+1], 16, &j);

Idem.

> @@ -660,12 +616,14 @@ void gigaset_handle_modem_response(struct cardstate *cs)
>  		case RT_NUMBER:
>  		case RT_HEX:
>  			if (curarg < params) {
> -				if (param_type == RT_HEX)
> -					event->parameter =
> -						isdn_gethex(argv[curarg]);
> -				else
> -					event->parameter =
> -						isdn_getnum(argv[curarg]);
> +				int base = (param_type == RT_HEX) ? 16 : 10;
> +				unsigned long res;
> +				int rc;
> +
> +				rc = strict_strtoul(argv[curarg], base, &res);

Idem.

Thanks,
Tilman

- -- 
Tilman Schmidt                    E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.12 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkuE6ZMACgkQQ3+did9BuFtLUQCfcPv6XMsFCmSJ+BfU4W42F1k4
tI0AnjsOK0rGkIF3Gnx4S4z3bzMriCw3
=xfZT
-----END PGP SIGNATURE-----