Skip to content

Commit 5666cdf

Browse files
doegoxdoegox
committed
make style
1 parent 10fdef1 commit 5666cdf

11 files changed

Lines changed: 399 additions & 78 deletions

File tree

‎armsrc/felicasim.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ static const felica_sim_node_record_t *felica_sim_find_node(const felica_sim_mod
312312
}
313313

314314
static const felica_sim_block_record_t *felica_sim_find_block(const felica_sim_model_header_t *hdr, const uint8_t *model,
315-
const felica_sim_node_record_t *node, uint16_t block_number) {
315+
const felica_sim_node_record_t *node, uint16_t block_number) {
316316
const felica_sim_block_record_t *blocks = felica_sim_blocks(hdr, model);
317317
const uint16_t end = node->first_block + node->block_count;
318318
for (uint16_t i = node->first_block; i < end; i++) {
@@ -467,8 +467,8 @@ static uint16_t felica_sim_process_reset_mode(const uint8_t *req, uint16_t req_l
467467
}
468468

469469
static uint16_t felica_sim_process_request_specification_version(const felica_sim_model_header_t *hdr, const uint8_t *model,
470-
const uint8_t *req, uint16_t req_len,
471-
const felica_sim_system_record_t *active_system, uint8_t *resp) {
470+
const uint8_t *req, uint16_t req_len,
471+
const felica_sim_system_record_t *active_system, uint8_t *resp) {
472472
const uint8_t *specification_version = felica_sim_specification_version_data(hdr, model);
473473
if (specification_version == NULL ||
474474
req_len != 12 ||
@@ -508,8 +508,8 @@ static uint16_t felica_sim_process_get_product_information(const felica_sim_mode
508508
}
509509

510510
static uint16_t felica_sim_process_get_container_issue_information(const felica_sim_model_header_t *hdr, const uint8_t *model,
511-
const uint8_t *req, uint16_t req_len,
512-
const felica_sim_system_record_t *active_system, uint8_t *resp) {
511+
const uint8_t *req, uint16_t req_len,
512+
const felica_sim_system_record_t *active_system, uint8_t *resp) {
513513
const uint8_t *container_issue_information = felica_sim_container_issue_information_data(hdr, model);
514514
if (container_issue_information == NULL ||
515515
req_len != 12 ||

‎client/src/cmdhf15.c‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,9 +1302,9 @@ static int reader_single_tag(bool fast, bool loop, uint8_t *afi_buf, int afi_len
13021302
uint16_t raw_len = 0;
13031303

13041304
raw_cmd[raw_len] = ISO15_REQ_SUBCARRIER_SINGLE
1305-
| ISO15_REQ_DATARATE_HIGH
1306-
| ISO15_REQ_INVENTORY
1307-
| ISO15_REQINV_SLOT1;
1305+
| ISO15_REQ_DATARATE_HIGH
1306+
| ISO15_REQ_INVENTORY
1307+
| ISO15_REQINV_SLOT1;
13081308
if (afi_len > 0)
13091309
raw_cmd[raw_len] |= ISO15_REQINV_AFI;
13101310
raw_len++;
@@ -1374,9 +1374,12 @@ static void iso15_render_presence_table(const iso15_seen_tag_t *seen, int n,
13741374
const char *c_off = g_session.supports_colors ? "\x1b[0m" : "";
13751375

13761376
int lines = 0;
1377-
printf("hf 15 --all present %d / %d " _GREEN_("<Enter>") " to exit", present, n); lines++;
1378-
printf("\n%3s %-25s %-5s %s", "#", "UID", "DSFID", "status"); lines++;
1379-
printf("\n%3s %-25s %-5s %s", "---", "-------------------------", "-----", "----------------"); lines++;
1377+
printf("hf 15 --all present %d / %d " _GREEN_("<Enter>") " to exit", present, n);
1378+
lines++;
1379+
printf("\n%3s %-25s %-5s %s", "#", "UID", "DSFID", "status");
1380+
lines++;
1381+
printf("\n%3s %-25s %-5s %s", "---", "-------------------------", "-----", "----------------");
1382+
lines++;
13801383
for (int i = 0; i < n; i++) {
13811384
if (seen[i].present) {
13821385
printf("\n%3d %-25s %02X %spresent%s",
@@ -1400,9 +1403,9 @@ static int reader_inventory_all(bool fast, bool loop, uint8_t *afi_buf, int afi_
14001403
uint8_t mask_len; // in bits
14011404
} inventory_work_item_t;
14021405

1403-
#define MAX_WORK_ITEMS 256
1404-
#define MAX_FOUND_TAGS 64
1405-
#define MAX_SEEN_TAGS 128
1406+
#define MAX_WORK_ITEMS 256
1407+
#define MAX_FOUND_TAGS 64
1408+
#define MAX_SEEN_TAGS 128
14061409

14071410
// Persistent across scans in continuous (-@) mode: every UID seen this session.
14081411
iso15_seen_tag_t seen[MAX_SEEN_TAGS];
@@ -1433,8 +1436,8 @@ static int reader_inventory_all(bool fast, bool loop, uint8_t *afi_buf, int afi_
14331436
uint16_t raw_len = 0;
14341437

14351438
raw_cmd[raw_len] = ISO15_REQ_SUBCARRIER_SINGLE
1436-
| ISO15_REQ_DATARATE_HIGH
1437-
| ISO15_REQ_INVENTORY;
1439+
| ISO15_REQ_DATARATE_HIGH
1440+
| ISO15_REQ_INVENTORY;
14381441
// 16-slot: do NOT set ISO15_REQINV_SLOT1
14391442
if (afi_len > 0)
14401443
raw_cmd[raw_len] |= ISO15_REQINV_AFI;

‎client/src/cmdhffelica.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ static int felica_request_service_key_versions(uint8_t flags, const uint8_t *idm
12511251
uint8_t data[1 + 1 + 8 + 1 + (FELICA_REQUEST_SERVICE_DISCOVERY_BATCH_SIZE * 2)] = {0};
12521252
uint16_t datalen = 0;
12531253
int ret = felica_build_request_service_payload(FELICA_REQSRV_REQ, idm, node_codes_le, node_count,
1254-
data, sizeof(data), &datalen);
1254+
data, sizeof(data), &datalen);
12551255
if (ret != PM3_SUCCESS) {
12561256
return ret;
12571257
}
@@ -1306,7 +1306,7 @@ static int felica_request_service_v2_key_versions(uint8_t flags, const uint8_t *
13061306
uint8_t data[1 + 1 + 8 + 1 + (FELICA_REQUEST_SERVICE_DISCOVERY_BATCH_SIZE * 2)] = {0};
13071307
uint16_t datalen = 0;
13081308
int ret = felica_build_request_service_payload(FELICA_REQSRV2_REQ, idm, node_codes_le, node_count,
1309-
data, sizeof(data), &datalen);
1309+
data, sizeof(data), &datalen);
13101310
if (ret != PM3_SUCCESS) {
13111311
return ret;
13121312
}
@@ -1357,14 +1357,14 @@ static int felica_request_service_v2_key_versions(uint8_t flags, const uint8_t *
13571357

13581358
for (size_t i = 0; i < returned_nodes; i++) {
13591359
key_versions_out->aes_key_versions_le[i] = (uint16_t)resp.data.asBytes[offset + i * 2] |
1360-
((uint16_t)resp.data.asBytes[offset + i * 2 + 1] << 8);
1360+
((uint16_t)resp.data.asBytes[offset + i * 2 + 1] << 8);
13611361
}
13621362
offset += aes_bytes;
13631363

13641364
if (has_des_key_versions) {
13651365
for (size_t i = 0; i < returned_nodes; i++) {
13661366
key_versions_out->des_key_versions_le[i] = (uint16_t)resp.data.asBytes[offset + i * 2] |
1367-
((uint16_t)resp.data.asBytes[offset + i * 2 + 1] << 8);
1367+
((uint16_t)resp.data.asBytes[offset + i * 2 + 1] << 8);
13681368
}
13691369
}
13701370

@@ -3564,7 +3564,7 @@ static bool felica_discover_nodes_with_read_without_encryption(uint8_t *flags,
35643564
uint32_t *discovered_count,
35653565
int *stop_status) {
35663566
return felica_discover_nodes_with_read_without_encryption_ex(flags, idm, retry_count, NULL,
3567-
visitor, ctx, discovered_count, stop_status);
3567+
visitor, ctx, discovered_count, stop_status);
35683568
}
35693569

35703570
static const char *felica_node_discovery_method_cli_name(felica_node_discovery_method_t method) {
@@ -3629,7 +3629,7 @@ static int felica_discover_nodes(const uint8_t *idm,
36293629
bool discovered = false;
36303630
if (info->method == FELICA_NODE_DISCOVERY_READ_WITHOUT_ENCRYPTION) {
36313631
discovered = felica_discover_nodes_with_read_without_encryption_ex(flags, idm, retry_count, pmm,
3632-
visitor, ctx, &discovered_count, &stop_status);
3632+
visitor, ctx, &discovered_count, &stop_status);
36333633
} else {
36343634
discovered = info->run(flags, idm, retry_count, visitor, ctx, &discovered_count, &stop_status);
36353635
}
@@ -4291,7 +4291,7 @@ static int felica_dump_collect_key_versions_v2(felica_dump_system_t *system, uin
42914291

42924292
felica_request_service_v2_key_versions_t versions;
42934293
int ret = felica_request_service_v2_key_versions(flags, system->idm, batch_codes, batch_count,
4294-
retry_count, &versions);
4294+
retry_count, &versions);
42954295
if (ret != PM3_SUCCESS) {
42964296
return ret;
42974297
}
@@ -4336,7 +4336,7 @@ static int felica_dump_collect_key_versions_v1(felica_dump_system_t *system, uin
43364336

43374337
size_t returned_nodes = 0;
43384338
int ret = felica_request_service_key_versions(flags, system->idm, batch_codes, batch_count,
4339-
retry_count, key_versions, &returned_nodes);
4339+
retry_count, key_versions, &returned_nodes);
43404340
if (ret != PM3_SUCCESS) {
43414341
return ret;
43424342
}
@@ -4772,7 +4772,7 @@ static int CmdHFFelicaAuthentication1(const char *Cmd) {
47724772
PrintAndLogEx(ERR, "response code does not match");
47734773
return PM3_ERFTRANS;
47744774
}
4775-
4775+
47764776
PrintAndLogEx(SUCCESS, "Auth1 response:");
47774777
PrintAndLogEx(SUCCESS, "IDm... %s", sprint_hex(auth1_response.frame_response.IDm, sizeof(auth1_response.frame_response.IDm)));
47784778
PrintAndLogEx(SUCCESS, "M2C... %s", sprint_hex(auth1_response.m2c, sizeof(auth1_response.m2c)));
@@ -5646,7 +5646,7 @@ static int CmdHFFelicaDump(const char *Cmd) {
56465646
uint32_t public_service_count = 0;
56475647
felica_dump_system_t *dump_system = &dump_systems[dump_system_count];
56485648
const int ret = felica_dump_single_system(&discovered_systems.systems[i], dump_system,
5649-
retry_count, &discovered_nodes, &service_count, &public_service_count);
5649+
retry_count, &discovered_nodes, &service_count, &public_service_count);
56505650

56515651
if (ret == PM3_EOPABORTED) {
56525652
DropField();
@@ -6840,7 +6840,7 @@ static int CmdHFFelicaSim(const char *Cmd) {
68406840
arg_param_begin,
68416841
arg_str1("f", "file", "<fn>", "JSON dump file"),
68426842
arg_str0(NULL, "read-without-encryption-error-location-indication",
6843-
"<mask|index|flag>", "Read Without Encryption error location indication (default: mask)"),
6843+
"<mask|index|flag>", "Read Without Encryption error location indication (default: mask)"),
68446844
arg_lit0("v", "verbose", "verbose output"),
68456845
arg_param_end
68466846
};

‎client/src/cmdhfmf.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8564,7 +8564,7 @@ static int CmdHF14AMfView(const char *Cmd) {
85648564
}
85658565

85668566
const mad1_sector_t *vigik_s0 = (bytes_read >= sizeof(mad1_sector_t))
8567-
? (const mad1_sector_t *)dump : NULL;
8567+
? (const mad1_sector_t *)dump : NULL;
85688568

85698569
int sector = vigik_s0 ? DetectHID(vigik_s0, 0x4910) : -1;
85708570
if (sector > -1) {

0 commit comments

Comments
 (0)