Skip to content

Commit a3bb162

Browse files
ci(pre-commit): Apply automatic fixes
1 parent ae20036 commit a3bb162

File tree

2 files changed

+44
-38
lines changed

2 files changed

+44
-38
lines changed

Diff for: .pre-commit-config.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,14 @@ repos:
3535
hooks:
3636
- id: cppcheck
3737
types_or: [c, c++]
38-
args: [--force, --enable=all, --suppress=missingInclude, --inline-suppr, --inconclusive]
38+
args:
39+
[
40+
--force,
41+
--enable=all,
42+
--suppress=missingInclude,
43+
--inline-suppr,
44+
--inconclusive,
45+
]
3946
- repo: https://github.com/psf/black-pre-commit-mirror
4047
rev: "22.10.0"
4148
hooks:

Diff for: cores/esp32/HEXBuilder.cpp

+36-37
Original file line numberDiff line numberDiff line change
@@ -20,52 +20,51 @@
2020
#include <Arduino.h>
2121
#include <HEXBuilder.h>
2222

23-
static uint8_t hex_char_to_byte(uint8_t c)
24-
{
25-
return (c >= 'a' && c <= 'f') ? (c - ((uint8_t)'a' - 0xa)) :
26-
(c >= 'A' && c <= 'F') ? (c - ((uint8_t)'A' - 0xA)) :
27-
(c >= '0' && c<= '9') ? (c - (uint8_t)'0') : 0x10; // unknown char is 16
23+
static uint8_t hex_char_to_byte(uint8_t c) {
24+
return (c >= 'a' && c <= 'f') ? (c - ((uint8_t)'a' - 0xa)) : (c >= 'A' && c <= 'F') ? (c - ((uint8_t)'A' - 0xA))
25+
: (c >= '0' && c <= '9') ? (c - (uint8_t)'0')
26+
: 0x10; // unknown char is 16
2827
}
2928

30-
size_t HEXBuilder::hex2bytes(unsigned char * out, size_t maxlen, String &in) {
31-
return hex2bytes(out, maxlen, in.c_str());
29+
size_t HEXBuilder::hex2bytes(unsigned char *out, size_t maxlen, String &in) {
30+
return hex2bytes(out, maxlen, in.c_str());
3231
}
3332

34-
size_t HEXBuilder::hex2bytes(unsigned char * out, size_t maxlen, const char * in) {
35-
size_t len = 0;
36-
for(;*in;in++) {
37-
uint8_t c = hex_char_to_byte(*in);
38-
// Silently skip anything unknown.
39-
if (c > 15)
40-
continue;
33+
size_t HEXBuilder::hex2bytes(unsigned char *out, size_t maxlen, const char *in) {
34+
size_t len = 0;
35+
for (; *in; in++) {
36+
uint8_t c = hex_char_to_byte(*in);
37+
// Silently skip anything unknown.
38+
if (c > 15)
39+
continue;
4140

42-
if (len & 1) {
43-
if (len/2 < maxlen)
44-
out[len/2] |= c;
45-
} else {
46-
if (len/2 < maxlen)
47-
out[len/2] = c<<4;
48-
}
49-
len++;
41+
if (len & 1) {
42+
if (len / 2 < maxlen)
43+
out[len / 2] |= c;
44+
} else {
45+
if (len / 2 < maxlen)
46+
out[len / 2] = c << 4;
5047
}
51-
return (len + 1)/2;
48+
len++;
49+
}
50+
return (len + 1) / 2;
5251
}
5352

54-
size_t HEXBuilder::bytes2hex(char * out, size_t maxlen, const unsigned char * in, size_t len) {
55-
for(size_t i = 0; i < len; i++) {
56-
if (i*2 + 1 < maxlen) {
57-
sprintf(out + (i * 2), "%02x", in[i]);
58-
}
53+
size_t HEXBuilder::bytes2hex(char *out, size_t maxlen, const unsigned char *in, size_t len) {
54+
for (size_t i = 0; i < len; i++) {
55+
if (i * 2 + 1 < maxlen) {
56+
sprintf(out + (i * 2), "%02x", in[i]);
5957
}
60-
return len * 2 + 1;
58+
}
59+
return len * 2 + 1;
6160
}
6261

63-
String HEXBuilder::bytes2hex(const unsigned char * in, size_t len) {
64-
size_t maxlen = len * 2 + 1;
65-
char * out = (char *) malloc(maxlen);
66-
if (!out) return String();
67-
bytes2hex(out, maxlen, in, len);
68-
String ret = String(out);
69-
free(out);
70-
return ret;
62+
String HEXBuilder::bytes2hex(const unsigned char *in, size_t len) {
63+
size_t maxlen = len * 2 + 1;
64+
char *out = (char *)malloc(maxlen);
65+
if (!out) return String();
66+
bytes2hex(out, maxlen, in, len);
67+
String ret = String(out);
68+
free(out);
69+
return ret;
7170
}

0 commit comments

Comments
 (0)