summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorJett Rink <jettrink@chromium.org>2020-11-10 17:10:57 -0700
committerCommit Bot <commit-bot@chromium.org>2020-11-11 18:37:36 +0000
commite2dfdb09d970143b521a9c6f316ebe09159988ed (patch)
tree02fc659853834812b28387060aed74e0ad722bdb /extra
parent737d4205a62c4b70ad33a6fbd547f5cb3f2b888c (diff)
downloadchrome-ec-e2dfdb09d970143b521a9c6f316ebe09159988ed.tar.gz
tree: rename strtoul to strtoull since it is 64-bit
A long is 32-bit, but a long long is 64-bit. The function name should be strtoull if it is returning 64 bits of data. BRANCH=none BUG=b:172592963 TEST=builds Signed-off-by: Jett Rink <jettrink@chromium.org> Change-Id: I04c40f9256ed37eb1cf9b6bd1b0ef0320fe49b0c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2530874 Commit-Queue: Jack Rosenthal <jrosenth@chromium.org> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'extra')
-rw-r--r--extra/ftdi_hostcmd/test_cmds.c4
-rw-r--r--extra/touchpad_updater/touchpad_updater.c6
-rw-r--r--extra/usb_console/usb_console.c6
-rw-r--r--extra/usb_updater/usb_updater2.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/extra/ftdi_hostcmd/test_cmds.c b/extra/ftdi_hostcmd/test_cmds.c
index 9ee27cd6d4..4552476d0f 100644
--- a/extra/ftdi_hostcmd/test_cmds.c
+++ b/extra/ftdi_hostcmd/test_cmds.c
@@ -596,9 +596,9 @@ int main(int argc, char *argv[])
/* Range (no error checking) */
if (optind < argc)
- start = (uint16_t)strtoul(argv[optind++], 0, 0);
+ start = (uint16_t)strtoull(argv[optind++], 0, 0);
if (optind < argc)
- stop = (uint16_t)strtoul(argv[optind++], 0, 0);
+ stop = (uint16_t)strtoull(argv[optind++], 0, 0);
/* Find something to talk to */
mpsse = MPSSE(SPI0, 1000000, 0);
diff --git a/extra/touchpad_updater/touchpad_updater.c b/extra/touchpad_updater/touchpad_updater.c
index 598f7638e1..985ab1ca46 100644
--- a/extra/touchpad_updater/touchpad_updater.c
+++ b/extra/touchpad_updater/touchpad_updater.c
@@ -91,21 +91,21 @@ static void parse_cmdline(int argc, char *argv[])
firmware_binary = optarg;
break;
case 'p':
- pid = (uint16_t) strtoul(optarg, &e, 16);
+ pid = (uint16_t) strtoull(optarg, &e, 16);
if (!*optarg || (e && *e)) {
printf("Invalid argument: \"%s\"\n", optarg);
errorcnt++;
}
break;
case 'v':
- vid = (uint16_t) strtoul(optarg, &e, 16);
+ vid = (uint16_t) strtoull(optarg, &e, 16);
if (!*optarg || (e && *e)) {
printf("Invalid argument: \"%s\"\n", optarg);
errorcnt++;
}
break;
case 'e':
- ep_num = (uint8_t) strtoul(optarg, &e, 0);
+ ep_num = (uint8_t) strtoull(optarg, &e, 0);
if (!*optarg || (e && *e)) {
printf("Invalid argument: \"%s\"\n", optarg);
errorcnt++;
diff --git a/extra/usb_console/usb_console.c b/extra/usb_console/usb_console.c
index 7d99bc3082..3599076a23 100644
--- a/extra/usb_console/usb_console.c
+++ b/extra/usb_console/usb_console.c
@@ -279,21 +279,21 @@ int main(int argc, char *argv[])
while ((i = getopt_long(argc, argv, short_opts, long_opts, 0)) != -1) {
switch (i) {
case 'p':
- pid = (uint16_t) strtoul(optarg, &e, 16);
+ pid = (uint16_t) strtoull(optarg, &e, 16);
if (!*optarg || (e && *e)) {
printf("Invalid argument: \"%s\"\n", optarg);
errorcnt++;
}
break;
case 'v':
- vid = (uint16_t) strtoul(optarg, &e, 16);
+ vid = (uint16_t) strtoull(optarg, &e, 16);
if (!*optarg || (e && *e)) {
printf("Invalid argument: \"%s\"\n", optarg);
errorcnt++;
}
break;
case 'e':
- ep_num = (uint8_t) strtoul(optarg, &e, 0);
+ ep_num = (uint8_t) strtoull(optarg, &e, 0);
if (!*optarg || (e && *e)) {
printf("Invalid argument: \"%s\"\n", optarg);
errorcnt++;
diff --git a/extra/usb_updater/usb_updater2.c b/extra/usb_updater/usb_updater2.c
index 10bfeee7bb..971a977e55 100644
--- a/extra/usb_updater/usb_updater2.c
+++ b/extra/usb_updater/usb_updater2.c
@@ -377,11 +377,11 @@ static int parse_vidpid(const char *input, uint16_t *vid_ptr, uint16_t *pid_ptr)
return 0;
*s++ = '\0';
- *vid_ptr = (uint16_t) strtoul(copy, &e, 16);
+ *vid_ptr = (uint16_t) strtoull(copy, &e, 16);
if (!*optarg || (e && *e))
return 0;
- *pid_ptr = (uint16_t) strtoul(s, &e, 16);
+ *pid_ptr = (uint16_t) strtoull(s, &e, 16);
if (!*optarg || (e && *e))
return 0;