|
1 | 1 | /*
|
2 | 2 | * This file has been copied from the zcbor library.
|
3 |
| - * Commit zcbor 0.8.0 |
| 3 | + * Commit zcbor 0.8.1 |
4 | 4 | */
|
5 | 5 |
|
6 | 6 | /*
|
@@ -93,23 +93,27 @@ static void zcbor_print_compare_lines(const uint8_t *str1, const uint8_t *str2,
|
93 | 93 | __attribute__((used))
|
94 | 94 | static void zcbor_print_compare_strings(const uint8_t *str1, const uint8_t *str2, uint32_t size)
|
95 | 95 | {
|
96 |
| - for (uint32_t i = 0; i <= size / 16; i++) { |
97 |
| - zcbor_do_print("line %d (char %d)\r\n", i, i*16); |
98 |
| - zcbor_print_compare_lines(&str1[i*16], &str2[i*16], |
99 |
| - MIN(16, (size - i*16))); |
| 96 | + const size_t col_width = 16; |
| 97 | + |
| 98 | + for (size_t i = 0; i <= size / col_width; i++) { |
| 99 | + zcbor_do_print("line %zu (char %zu)\r\n", i, i*col_width); |
| 100 | + zcbor_print_compare_lines(&str1[i*col_width], &str2[i*col_width], |
| 101 | + MIN(col_width, (size - i*col_width))); |
100 | 102 | }
|
101 | 103 | zcbor_do_print("\r\n");
|
102 | 104 | }
|
103 | 105 |
|
104 | 106 | __attribute__((used))
|
105 | 107 | static void zcbor_print_compare_strings_diff(const uint8_t *str1, const uint8_t *str2, uint32_t size)
|
106 | 108 | {
|
| 109 | + const size_t col_width = 16; |
107 | 110 | bool printed = false;
|
108 |
| - for (uint32_t i = 0; i <= size / 16; i++) { |
109 |
| - if (memcmp(&str1[i*16], &str2[i*16], MIN(16, (size - i*16))) != 0) { |
110 |
| - zcbor_do_print("line %d (char %d)\r\n", i, i*16); |
111 |
| - zcbor_print_compare_lines(&str1[i*16], &str2[i*16], |
112 |
| - MIN(16, (size - i*16))); |
| 111 | + |
| 112 | + for (size_t i = 0; i <= size / col_width; i++) { |
| 113 | + if (memcmp(&str1[i*col_width], &str2[i*col_width], MIN(col_width, (size - i*col_width))) != 0) { |
| 114 | + zcbor_do_print("line %zu (char %zu)\r\n", i, i*col_width); |
| 115 | + zcbor_print_compare_lines(&str1[i*col_width], &str2[i*col_width], |
| 116 | + MIN(col_width, (size - i*col_width))); |
113 | 117 | printed = true;
|
114 | 118 | }
|
115 | 119 | }
|
|
0 commit comments