Skip to content

Commit 8d7167c

Browse files
akopachovakopachov
committed
Ran clang format
1 parent 8083b9e commit 8d7167c

File tree

7 files changed

+63
-31
lines changed

7 files changed

+63
-31
lines changed

‎services/cli/cli.c

+13-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
static void totp_cli_print_unknown_command(FuriString* unknown_command) {
1313
TOTP_CLI_PRINTF(
14-
"Command \"%s\" is unknown. Use \"" TOTP_CLI_COMMAND_HELP "\" command to get list of available commands.",
14+
"Command \"%s\" is unknown. Use \"" TOTP_CLI_COMMAND_HELP
15+
"\" command to get list of available commands.",
1516
furi_string_get_cstr(unknown_command));
1617
}
1718

@@ -22,22 +23,25 @@ static void totp_cli_handler(Cli* cli, FuriString* args, void* context) {
2223

2324
args_read_string_and_trim(args, cmd);
2425

25-
if(furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_HELP) == 0 ||
26-
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_HELP_ALT) == 0 ||
27-
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_HELP_ALT2) == 0 ||
28-
furi_string_empty(cmd)) {
26+
if(furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_HELP) == 0 ||
27+
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_HELP_ALT) == 0 ||
28+
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_HELP_ALT2) == 0 || furi_string_empty(cmd)) {
2929
totp_cli_command_help_handle();
30-
} else if(furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_ADD) == 0 ||
30+
} else if(
31+
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_ADD) == 0 ||
3132
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_ADD_ALT) == 0 ||
3233
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_ADD_ALT2) == 0) {
3334
totp_cli_command_add_handle(plugin_state, args, cli);
34-
} else if(furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_LIST) == 0 ||
35+
} else if(
36+
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_LIST) == 0 ||
3537
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_LIST_ALT) == 0) {
3638
totp_cli_command_list_handle(plugin_state, cli);
37-
} else if(furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_DELETE) == 0 ||
39+
} else if(
40+
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_DELETE) == 0 ||
3841
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_DELETE_ALT) == 0) {
3942
totp_cli_command_delete_handle(plugin_state, args, cli);
40-
} else if(furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_TIMEZONE) == 0 ||
43+
} else if(
44+
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_TIMEZONE) == 0 ||
4145
furi_string_cmp_str(cmd, TOTP_CLI_COMMAND_TIMEZONE_ALT) == 0) {
4246
totp_cli_command_timezone_handle(plugin_state, args, cli);
4347
} else {

‎services/cli/cli_helpers.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#define TOTP_CLI_DELETE_LAST_LINE() TOTP_CLI_PRINTF("\033[A\33[2K\r")
2323
#define TOTP_CLI_DELETE_CURRENT_LINE() TOTP_CLI_PRINTF("\33[2K\r")
24-
#define TOTP_CLI_PRINT_INVALID_ARGUMENTS() TOTP_CLI_PRINTF("Invalid command arguments. use \"help\" command to get list of available commands")
24+
#define TOTP_CLI_PRINT_INVALID_ARGUMENTS() \
25+
TOTP_CLI_PRINTF( \
26+
"Invalid command arguments. use \"help\" command to get list of available commands")
2527

2628
bool totp_cli_ensure_authenticated(PluginState* plugin_state, Cli* cli);

‎services/cli/commands/add/add.c

+20-9
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,36 @@ static bool token_info_set_algo_from_str(TokenInfo* token_info, FuriString* str)
4747
}
4848

4949
void totp_cli_command_add_docopt_commands() {
50-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_ADD ", " TOTP_CLI_COMMAND_ADD_ALT ", " TOTP_CLI_COMMAND_ADD_ALT2 " Add new token\r\n");
50+
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_ADD ", " TOTP_CLI_COMMAND_ADD_ALT
51+
", " TOTP_CLI_COMMAND_ADD_ALT2 " Add new token\r\n");
5152
}
5253

5354
void totp_cli_command_add_docopt_usage() {
54-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_NAME " " DOCOPT_REQUIRED(TOTP_CLI_COMMAND_ADD " | " TOTP_CLI_COMMAND_ADD_ALT " | " TOTP_CLI_COMMAND_ADD_ALT2) " " DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_ADD_ARG_NAME) " "
55-
DOCOPT_OPTIONAL(DOCOPT_OPTION(TOTP_CLI_COMMAND_ADD_ARG_ALGO_PREFIX, DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_ADD_ARG_ALGO))) " "
56-
DOCOPT_OPTIONAL(DOCOPT_OPTION(TOTP_CLI_COMMAND_ADD_ARG_DIGITS_PREFIX, DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_ADD_ARG_DIGITS))) " "
57-
DOCOPT_OPTIONAL(DOCOPT_SWITCH(TOTP_CLI_COMMAND_ADD_ARG_UNSECURE_PREFIX))"\r\n");
55+
TOTP_CLI_PRINTF(
56+
" " TOTP_CLI_COMMAND_NAME
57+
" " DOCOPT_REQUIRED(TOTP_CLI_COMMAND_ADD " | " TOTP_CLI_COMMAND_ADD_ALT " | " TOTP_CLI_COMMAND_ADD_ALT2) " " DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_ADD_ARG_NAME) " " DOCOPT_OPTIONAL(
58+
DOCOPT_OPTION(
59+
TOTP_CLI_COMMAND_ADD_ARG_ALGO_PREFIX,
60+
DOCOPT_ARGUMENT(
61+
TOTP_CLI_COMMAND_ADD_ARG_ALGO))) " " DOCOPT_OPTIONAL(DOCOPT_OPTION(TOTP_CLI_COMMAND_ADD_ARG_DIGITS_PREFIX, DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_ADD_ARG_DIGITS))) " " DOCOPT_OPTIONAL(DOCOPT_SWITCH(TOTP_CLI_COMMAND_ADD_ARG_UNSECURE_PREFIX)) "\r\n");
5862
}
5963

6064
void totp_cli_command_add_docopt_arguments() {
6165
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_ADD_ARG_NAME " Token name\r\n");
6266
}
6367

6468
void totp_cli_command_add_docopt_options() {
65-
TOTP_CLI_PRINTF(" " DOCOPT_OPTION(TOTP_CLI_COMMAND_ADD_ARG_ALGO_PREFIX, DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_ADD_ARG_ALGO)) " Token hashing algorithm.\r\n");
66-
TOTP_CLI_PRINTF(" Could be one of: sha1, sha256, sha512 " DOCOPT_DEFAULT("sha1") "\r\n");
67-
TOTP_CLI_PRINTF(" " DOCOPT_OPTION(TOTP_CLI_COMMAND_ADD_ARG_DIGITS_PREFIX, DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_ADD_ARG_DIGITS))" Number of digits to generate, one of: 6, 8 " DOCOPT_DEFAULT("6") "\r\n");
68-
TOTP_CLI_PRINTF(" " DOCOPT_SWITCH(TOTP_CLI_COMMAND_ADD_ARG_UNSECURE_PREFIX) " Show console user input as-is without masking\r\n");
69+
TOTP_CLI_PRINTF(" " DOCOPT_OPTION(
70+
TOTP_CLI_COMMAND_ADD_ARG_ALGO_PREFIX,
71+
DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_ADD_ARG_ALGO)) " Token hashing algorithm.\r\n");
72+
TOTP_CLI_PRINTF(
73+
" Could be one of: sha1, sha256, sha512 " DOCOPT_DEFAULT("sha1") "\r\n");
74+
TOTP_CLI_PRINTF(" " DOCOPT_OPTION(
75+
TOTP_CLI_COMMAND_ADD_ARG_DIGITS_PREFIX,
76+
DOCOPT_ARGUMENT(
77+
TOTP_CLI_COMMAND_ADD_ARG_DIGITS)) " Number of digits to generate, one of: 6, 8 " DOCOPT_DEFAULT("6") "\r\n");
78+
TOTP_CLI_PRINTF(" " DOCOPT_SWITCH(
79+
TOTP_CLI_COMMAND_ADD_ARG_UNSECURE_PREFIX) " Show console user input as-is without masking\r\n");
6980
}
7081

7182
void totp_cli_command_add_handle(PluginState* plugin_state, FuriString* args, Cli* cli) {

‎services/cli/commands/delete/delete.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,24 @@
1212
#define TOTP_CLI_COMMAND_DELETE_ARG_FORCE_SUFFIX "-f"
1313

1414
void totp_cli_command_delete_docopt_commands() {
15-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_DELETE ", " TOTP_CLI_COMMAND_DELETE_ALT " Delete existing token\r\n");
15+
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_DELETE ", " TOTP_CLI_COMMAND_DELETE_ALT
16+
" Delete existing token\r\n");
1617
}
1718

1819
void totp_cli_command_delete_docopt_usage() {
19-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_NAME " " DOCOPT_REQUIRED(TOTP_CLI_COMMAND_DELETE " | " TOTP_CLI_COMMAND_DELETE_ALT) " " DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_DELETE_ARG_INDEX) " "
20-
DOCOPT_OPTIONAL(DOCOPT_SWITCH(TOTP_CLI_COMMAND_DELETE_ARG_FORCE_SUFFIX)) "\r\n");
20+
TOTP_CLI_PRINTF(
21+
" " TOTP_CLI_COMMAND_NAME
22+
" " DOCOPT_REQUIRED(TOTP_CLI_COMMAND_DELETE " | " TOTP_CLI_COMMAND_DELETE_ALT) " " DOCOPT_ARGUMENT(
23+
TOTP_CLI_COMMAND_DELETE_ARG_INDEX) " " DOCOPT_OPTIONAL(DOCOPT_SWITCH(TOTP_CLI_COMMAND_DELETE_ARG_FORCE_SUFFIX)) "\r\n");
2124
}
2225

2326
void totp_cli_command_delete_docopt_arguments() {
2427
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_DELETE_ARG_INDEX " Token index in the list\r\n");
2528
}
2629

2730
void totp_cli_command_delete_docopt_options() {
28-
TOTP_CLI_PRINTF(" " DOCOPT_SWITCH(TOTP_CLI_COMMAND_DELETE_ARG_FORCE_SUFFIX) " Force command to do not ask user for interactive confirmation\r\n");
31+
TOTP_CLI_PRINTF(" " DOCOPT_SWITCH(
32+
TOTP_CLI_COMMAND_DELETE_ARG_FORCE_SUFFIX) " Force command to do not ask user for interactive confirmation\r\n");
2933
}
3034

3135
void totp_cli_command_delete_handle(PluginState* plugin_state, FuriString* args, Cli* cli) {

‎services/cli/commands/help/help.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66
#include "../timezone/timezone.h"
77

88
void totp_cli_command_help_docopt_commands() {
9-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_HELP ", " TOTP_CLI_COMMAND_HELP_ALT ", " TOTP_CLI_COMMAND_HELP_ALT2 " Show command usage help\r\n");
9+
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_HELP ", " TOTP_CLI_COMMAND_HELP_ALT
10+
", " TOTP_CLI_COMMAND_HELP_ALT2 " Show command usage help\r\n");
1011
}
1112

1213
void totp_cli_command_help_docopt_usage() {
13-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_NAME " " DOCOPT_REQUIRED(TOTP_CLI_COMMAND_HELP " | " TOTP_CLI_COMMAND_HELP_ALT " | " TOTP_CLI_COMMAND_HELP_ALT2) "\r\n");
14+
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_NAME " " DOCOPT_REQUIRED(
15+
TOTP_CLI_COMMAND_HELP " | " TOTP_CLI_COMMAND_HELP_ALT
16+
" | " TOTP_CLI_COMMAND_HELP_ALT2) "\r\n");
1417
}
1518

1619
void totp_cli_command_help_handle() {

‎services/cli/commands/list/list.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ static uint8_t get_digits_as_int(TokenDigitsCount digits) {
3030
}
3131

3232
void totp_cli_command_list_docopt_commands() {
33-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_LIST ", " TOTP_CLI_COMMAND_LIST_ALT " List all available tokens\r\n");
33+
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_LIST ", " TOTP_CLI_COMMAND_LIST_ALT
34+
" List all available tokens\r\n");
3435
}
3536

3637
void totp_cli_command_list_docopt_usage() {
37-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_NAME " " DOCOPT_REQUIRED(TOTP_CLI_COMMAND_LIST " | " TOTP_CLI_COMMAND_LIST_ALT) "\r\n");
38+
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_NAME " " DOCOPT_REQUIRED(
39+
TOTP_CLI_COMMAND_LIST " | " TOTP_CLI_COMMAND_LIST_ALT) "\r\n");
3840
}
3941

4042
void totp_cli_command_list_handle(PluginState* plugin_state, Cli* cli) {

‎services/cli/commands/timezone/timezone.c

+10-4
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,22 @@
77
#define TOTP_CLI_COMMAND_TIMEZONE_ARG_TIMEZONE "timezone"
88

99
void totp_cli_command_timezone_docopt_commands() {
10-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_TIMEZONE ", " TOTP_CLI_COMMAND_TIMEZONE_ALT " Get or set current timezone\r\n");
10+
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_TIMEZONE ", " TOTP_CLI_COMMAND_TIMEZONE_ALT
11+
" Get or set current timezone\r\n");
1112
}
1213

1314
void totp_cli_command_timezone_docopt_usage() {
14-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_NAME " " DOCOPT_REQUIRED(TOTP_CLI_COMMAND_TIMEZONE " | " TOTP_CLI_COMMAND_TIMEZONE_ALT) " " DOCOPT_OPTIONAL(DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_TIMEZONE_ARG_TIMEZONE)) "\r\n");
15+
TOTP_CLI_PRINTF(
16+
" " TOTP_CLI_COMMAND_NAME
17+
" " DOCOPT_REQUIRED(TOTP_CLI_COMMAND_TIMEZONE " | " TOTP_CLI_COMMAND_TIMEZONE_ALT) " " DOCOPT_OPTIONAL(
18+
DOCOPT_ARGUMENT(TOTP_CLI_COMMAND_TIMEZONE_ARG_TIMEZONE)) "\r\n");
1519
}
1620

1721
void totp_cli_command_timezone_docopt_arguments() {
18-
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_TIMEZONE_ARG_TIMEZONE " Timezone offset in hours to be set.\r\n");
19-
TOTP_CLI_PRINTF(" If not provided then current timezone offset will be printed\r\n");
22+
TOTP_CLI_PRINTF(" " TOTP_CLI_COMMAND_TIMEZONE_ARG_TIMEZONE
23+
" Timezone offset in hours to be set.\r\n");
24+
TOTP_CLI_PRINTF(
25+
" If not provided then current timezone offset will be printed\r\n");
2026
}
2127

2228
void totp_cli_command_timezone_handle(PluginState* plugin_state, FuriString* args, Cli* cli) {

0 commit comments

Comments
 (0)