Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51a6fbc8 authored by Julia Lawall's avatar Julia Lawall Committed by Marcel Holtmann
Browse files

Bluetooth: Change simple_strtol to simple_strtoul 

Since size, addr, fcs, and tmp are unsigned, it would seem better to use
simple_strtoul that simple_strtol.

A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@r2@
long e;
position p;
@@

e = simple_strtol@p(...)

@@
position p != r2.p;
type T;
T e;
@@

e =
- simple_strtol@p
+ simple_strtoul
  (...)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent db7aa1c2

drivers/bluetooth/bt3c_cs.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -502,15 +502,15 @@ static int bt3c_load_firmware(bt3c_info_t *info, const unsigned char *firmware, 




		memset(b, 0, sizeof(b));

		memset(b, 0, sizeof(b));

		memcpy(b, ptr + 2, 2);

		memcpy(b, ptr + 2, 2);

		size = simple_strtol(b, NULL, 16);

		size = simple_strtoul(b, NULL, 16);





		memset(b, 0, sizeof(b));

		memset(b, 0, sizeof(b));

		memcpy(b, ptr + 4, 8);

		memcpy(b, ptr + 4, 8);

		addr = simple_strtol(b, NULL, 16);

		addr = simple_strtoul(b, NULL, 16);





		memset(b, 0, sizeof(b));

		memset(b, 0, sizeof(b));

		memcpy(b, ptr + (size * 2) + 2, 2);

		memcpy(b, ptr + (size * 2) + 2, 2);

		fcs = simple_strtol(b, NULL, 16);

		fcs = simple_strtoul(b, NULL, 16);





		memset(b, 0, sizeof(b));

		memset(b, 0, sizeof(b));

		for (tmp = 0, i = 0; i < size; i++) {

		for (tmp = 0, i = 0; i < size; i++) {
@@ -530,7 +530,7 @@ static int bt3c_load_firmware(bt3c_info_t *info, const unsigned char *firmware, 
			memset(b, 0, sizeof(b));

			memset(b, 0, sizeof(b));

			for (i = 0; i < (size - 4) / 2; i++) {

			for (i = 0; i < (size - 4) / 2; i++) {

				memcpy(b, ptr + (i * 4) + 12, 4);

				memcpy(b, ptr + (i * 4) + 12, 4);

				tmp = simple_strtol(b, NULL, 16);

				tmp = simple_strtoul(b, NULL, 16);

				bt3c_put(iobase, tmp);

				bt3c_put(iobase, tmp);

			}

			}

		}

		}