Skip to content

Commit 7d02757

Browse files
marcinbor85marcinbor85
committed
remove warnings
1 parent f13f2b2 commit 7d02757

File tree

8 files changed

+35
-23
lines changed

8 files changed

+35
-23
lines changed

‎README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ CLIP_DEF_ROOT_COMMAND(g_adc_cmd, "adc", "control adc driver", NULL)
114114
CLIP_DEF_COMMAND("read", "read input", adc_read_callback) CLIP_DEF_WITH_ARGS()
115115
/* there will be 1 required argument in "adc read" command */
116116
CLIP_DEF_ARGUMENT("channel", "channel number", CLIP_ARG_TYPE_UINT)
117-
CLIP_DEF_COMMAND_END()
117+
CLIP_DEF_COMMAND_END_WITH_ARGS()
118118
CLIP_DEF_COMMAND("set", "set reference", adc_set_callback) CLIP_DEF_WITH_ARGS()
119119
/* there will be 1 required argument in "adc set" command */
120120
CLIP_DEF_ARGUMENT("vref", "voltage reference", CLIP_ARG_TYPE_FLOAT)
121-
CLIP_DEF_COMMAND_END()
121+
CLIP_DEF_COMMAND_END_WITH_ARGS()
122122
CLIP_DEF_COMMAND("start", "start sampling", adc_start_callback) CLIP_DEF_COMMAND_END()
123123
CLIP_DEF_COMMAND("stop", "stop sampling", adc_stop_callback) CLIP_DEF_COMMAND_END()
124124
CLIP_DEF_ROOT_COMMAND_END()
@@ -131,24 +131,24 @@ CLIP_DEF_ROOT_COMMAND(g_gpio_cmd, "gpio", "control gpio", NULL)
131131
CLIP_DEF_COMMAND("pin", "get pin state", gpio_get_pin_callback) CLIP_DEF_WITH_ARGS()
132132
/* there will be 1 required argument in "gpio get pin" command */
133133
CLIP_DEF_ARGUMENT("pin", "pin number", CLIP_ARG_TYPE_UINT)
134-
CLIP_DEF_COMMAND_END()
134+
CLIP_DEF_COMMAND_END_WITH_ARGS()
135135
CLIP_DEF_COMMAND("reg", "get register value", gpio_get_reg_callback) CLIP_DEF_WITH_ARGS()
136136
/* there will be 1 required argument in "gpio get reg" command */
137137
CLIP_DEF_ARGUMENT("address", "register address", CLIP_ARG_TYPE_UINT)
138-
CLIP_DEF_COMMAND_END()
138+
CLIP_DEF_COMMAND_END_WITH_ARGS()
139139
CLIP_DEF_COMMAND_END()
140140
CLIP_DEF_COMMAND("set", "set methods", NULL)
141141
/* there will be 2 subcommands: pin, reg */
142142
CLIP_DEF_COMMAND("pin", "set pin state", gpio_set_pin_callback) CLIP_DEF_WITH_ARGS()
143143
/* there will be 2 required arguments in "gpio set pin" command */
144144
CLIP_DEF_ARGUMENT("pin", "pin number", CLIP_ARG_TYPE_UINT)
145145
CLIP_DEF_ARGUMENT("state", "pin state", CLIP_ARG_TYPE_UINT)
146-
CLIP_DEF_COMMAND_END()
146+
CLIP_DEF_COMMAND_END_WITH_ARGS()
147147
CLIP_DEF_COMMAND("reg", "set register value", gpio_set_reg_callback) CLIP_DEF_WITH_ARGS()
148148
/* there will be 2 required arguments in "gpio set reg" command */
149149
CLIP_DEF_ARGUMENT("address", "register address", CLIP_ARG_TYPE_UINT)
150150
CLIP_DEF_ARGUMENT("value", "register value", CLIP_ARG_TYPE_UINT)
151-
CLIP_DEF_COMMAND_END()
151+
CLIP_DEF_COMMAND_END_WITH_ARGS()
152152
CLIP_DEF_COMMAND_END()
153153
CLIP_DEF_ROOT_COMMAND_END()
154154

@@ -159,12 +159,12 @@ CLIP_DEF_ROOT_COMMAND(g_mem_cmd, "mem", "memory driver", NULL)
159159
/* there will be 2 required arguments in "mem write" command */
160160
CLIP_DEF_ARGUMENT("address", "address to write", CLIP_ARG_TYPE_UINT)
161161
CLIP_DEF_ARGUMENT("data", "binary data to write", CLIP_ARG_TYPE_HEXARRAY)
162-
CLIP_DEF_COMMAND_END()
162+
CLIP_DEF_COMMAND_END_WITH_ARGS()
163163
CLIP_DEF_COMMAND("read", "read data from memory", mem_read_callback) CLIP_DEF_WITH_ARGS()
164164
/* there will be 2 required arguments in "mem read" command */
165165
CLIP_DEF_ARGUMENT("address", "address to read", CLIP_ARG_TYPE_UINT)
166166
CLIP_DEF_ARGUMENT("size", "number of bytes to read", CLIP_ARG_TYPE_UINT)
167-
CLIP_DEF_COMMAND_END()
167+
CLIP_DEF_COMMAND_END_WITH_ARGS()
168168
CLIP_DEF_ROOT_COMMAND_END()
169169

170170
/* Definition of command: exit */

‎examples/BasicCLI/cli.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ SOFTWARE.
2727
CLIP_DEF_ROOT_COMMAND(g_cli_gpio_cmd, "gpio", "control gpio", NULL)
2828
CLIP_DEF_COMMAND("get", "get pin state", cli_gpio_get_callback) CLIP_DEF_WITH_ARGS()
2929
CLIP_DEF_ARGUMENT("pin", "pin number", CLIP_ARG_TYPE_UINT)
30-
CLIP_DEF_COMMAND_END()
30+
CLIP_DEF_COMMAND_END_WITH_ARGS()
3131
CLIP_DEF_COMMAND("set", "set pin state", cli_gpio_set_callback) CLIP_DEF_WITH_ARGS()
3232
CLIP_DEF_ARGUMENT("pin", "pin number", CLIP_ARG_TYPE_UINT)
3333
CLIP_DEF_ARGUMENT("state", "pin state", CLIP_ARG_TYPE_UINT)
34-
CLIP_DEF_COMMAND_END()
34+
CLIP_DEF_COMMAND_END_WITH_ARGS()
3535
CLIP_DEF_ROOT_COMMAND_END()
3636

3737
CLIP_DEF_ROOT_COMMAND(g_cli_echo_cmd, "echo", "echo command", cli_echo_callback) CLIP_DEF_WITH_ARGS()
3838
CLIP_DEF_ARGUMENT("text", "text to print", CLIP_ARG_TYPE_STRING)
39-
CLIP_DEF_ROOT_COMMAND_END()
39+
CLIP_DEF_ROOT_COMMAND_END_WITH_ARGS()
4040

4141
CLIP_DEF_ROOT(g_cli_clip, NULL, cli_event_callback)
4242
CLIP_DEF_ADD_ROOT_COMMAND(&g_cli_gpio_cmd)

‎examples/linux/src/adc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ CLIP_DEF_ROOT_COMMAND(g_adc_cmd, "adc", "control adc driver", NULL)
6262

6363
CLIP_DEF_COMMAND("read", "read input", adc_read_callback) CLIP_DEF_WITH_ARGS()
6464
CLIP_DEF_ARGUMENT("channel", "channel number", CLIP_ARG_TYPE_UINT)
65-
CLIP_DEF_COMMAND_END()
65+
CLIP_DEF_COMMAND_END_WITH_ARGS()
6666

6767
CLIP_DEF_COMMAND("set", "set reference", adc_set_callback) CLIP_DEF_WITH_ARGS()
6868
CLIP_DEF_ARGUMENT("vref", "voltage reference", CLIP_ARG_TYPE_FLOAT)
69-
CLIP_DEF_COMMAND_END()
69+
CLIP_DEF_COMMAND_END_WITH_ARGS()
7070

7171
CLIP_DEF_COMMAND("start", "start sampling", adc_start_callback) CLIP_DEF_COMMAND_END()
7272
CLIP_DEF_COMMAND("stop", "stop sampling", adc_stop_callback) CLIP_DEF_COMMAND_END()

‎examples/linux/src/gpio.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@ CLIP_DEF_ROOT_COMMAND(g_gpio_cmd, "gpio", "control gpio", NULL)
6565
CLIP_DEF_COMMAND("get", "get methods", NULL)
6666
CLIP_DEF_COMMAND("pin", "get pin state", gpio_get_pin_callback) CLIP_DEF_WITH_ARGS()
6767
CLIP_DEF_ARGUMENT("pin", "pin number", CLIP_ARG_TYPE_UINT)
68-
CLIP_DEF_COMMAND_END()
68+
CLIP_DEF_COMMAND_END_WITH_ARGS()
6969

7070
CLIP_DEF_COMMAND("reg", "get register value", gpio_get_reg_callback) CLIP_DEF_WITH_ARGS()
7171
CLIP_DEF_ARGUMENT("address", "register address", CLIP_ARG_TYPE_UINT)
72-
CLIP_DEF_COMMAND_END()
72+
CLIP_DEF_COMMAND_END_WITH_ARGS()
7373
CLIP_DEF_COMMAND_END()
7474

7575
CLIP_DEF_COMMAND("set", "set methods", NULL)
7676
CLIP_DEF_COMMAND("pin", "set pin state", gpio_set_pin_callback) CLIP_DEF_WITH_ARGS()
7777
CLIP_DEF_ARGUMENT("pin", "pin number", CLIP_ARG_TYPE_UINT)
7878
CLIP_DEF_ARGUMENT("state", "pin state", CLIP_ARG_TYPE_UINT)
79-
CLIP_DEF_COMMAND_END()
79+
CLIP_DEF_COMMAND_END_WITH_ARGS()
8080

8181
CLIP_DEF_COMMAND("reg", "set register value", gpio_set_reg_callback) CLIP_DEF_WITH_ARGS()
8282
CLIP_DEF_ARGUMENT("address", "register address", CLIP_ARG_TYPE_UINT)
8383
CLIP_DEF_ARGUMENT("value", "register value", CLIP_ARG_TYPE_UINT)
84-
CLIP_DEF_COMMAND_END()
84+
CLIP_DEF_COMMAND_END_WITH_ARGS()
8585

8686
CLIP_DEF_COMMAND_END()
8787

‎examples/linux/src/mem.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ CLIP_DEF_ROOT_COMMAND(g_mem_cmd, "mem", "memory driver", NULL)
5353
CLIP_DEF_COMMAND("write", "write data to memory", mem_write_callback) CLIP_DEF_WITH_ARGS()
5454
CLIP_DEF_ARGUMENT("address", "address to write", CLIP_ARG_TYPE_UINT)
5555
CLIP_DEF_ARGUMENT("data", "binary data to write", CLIP_ARG_TYPE_HEXARRAY)
56-
CLIP_DEF_COMMAND_END()
56+
CLIP_DEF_COMMAND_END_WITH_ARGS()
5757

5858
CLIP_DEF_COMMAND("read", "read data from memory", mem_read_callback) CLIP_DEF_WITH_ARGS()
5959
CLIP_DEF_ARGUMENT("address", "address to read", CLIP_ARG_TYPE_UINT)
6060
CLIP_DEF_ARGUMENT("size", "number of bytes to read", CLIP_ARG_TYPE_UINT)
61-
CLIP_DEF_COMMAND_END()
61+
CLIP_DEF_COMMAND_END_WITH_ARGS()
6262

6363
CLIP_DEF_ROOT_COMMAND_END()

‎src/clip_cmd_call.c

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ void clip_cmd_call_command_callback(const struct clip *self, const struct clip_c
5151
av->val_str = arg;
5252

5353
const struct clip_arg *ca = NULL;
54-
char *end_arg = NULL;
5554
if (no_more_required_args == false && cmd->args != NULL) {
5655
ca = cmd->args[argc];
5756
if (ca != NULL) {

‎src/clip_defs.h

+16-2
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,18 @@ const struct clip_command var_name = {\
4848
_CLIP_DEF_COMMAND(cmd_name, cmd_description, callback_func)\
4949

5050
///< public macro for finishing root command definition
51-
#define CLIP_DEF_ROOT_COMMAND_END()\
51+
#define CLIP_DEF_ROOT_COMMAND_END_WITH_ARGS()\
5252
NULL,\
5353
}\
5454
};\
5555

56+
///< public macro for finishing root command without args definition
57+
#define CLIP_DEF_ROOT_COMMAND_END()\
58+
NULL,\
59+
},\
60+
.args = NULL\
61+
};\
62+
5663
///< public macro for defining command
5764
#define CLIP_DEF_COMMAND(cmd_name, cmd_description, callback_func)\
5865
&(const struct clip_command) {\
@@ -67,11 +74,18 @@ const struct clip_command var_name = {\
6774
},\
6875

6976
///< public macro for finishing command definition
70-
#define CLIP_DEF_COMMAND_END()\
77+
#define CLIP_DEF_COMMAND_END_WITH_ARGS()\
7178
NULL,\
7279
}\
7380
},\
7481

82+
///< public macro for finishing command without args definition
83+
#define CLIP_DEF_COMMAND_END()\
84+
NULL,\
85+
},\
86+
.args = NULL\
87+
},\
88+
7589
///< public macro for defining arguments for subcommand
7690
#define CLIP_DEF_WITH_ARGS()\
7791
NULL,\

‎src/clip_utils_arg.c

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ char* clip_utils_arg_get_first(char **arg, char *cmd_line)
3232
CLIP_CONFIG_ASSERT(arg != NULL);
3333
CLIP_CONFIG_ASSERT(cmd_line != NULL);
3434

35-
int state = 0;
3635
int escape = 0;
3736
int quotemark = 0;
3837
size_t arg_pos = 0;

0 commit comments

Comments
 (0)