Skip to content

Commit 8859c6c

Browse files
committed
remove const from json parsing return type, remove casting in dereference
1 parent e72c8b9 commit 8859c6c

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

tests/tools/TestApp/Inc/input.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
#ifndef _INPUT_H_
88
#define _INPUT_H_
99

10-
const char *parse_json_to_string(const char *file_name);
10+
char *parse_json_to_string(const char *file_name);
1111

1212
#endif /* _INPUT_H_ */

tests/tools/TestApp/rx_app.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include "Inc/input.h"
55
#include "Inc/mcm.h"
66

7-
const char *client_cfg;
8-
const char *conn_cfg;
7+
char *client_cfg;
8+
char *conn_cfg;
99

1010
int main(int argc, char *argv[]) {
1111
if (!is_root()) {
@@ -51,10 +51,9 @@ int main(int argc, char *argv[]) {
5151
mesh_delete_connection(&connection);
5252
mesh_delete_client(&client);
5353
printf("[RX] Shutdown completed exiting\n");
54-
goto safe_exit;
5554

5655
safe_exit:
57-
free((char *)client_cfg);
58-
free((char *)conn_cfg);
59-
return (err == 0) ? 0 : err;
56+
free(client_cfg);
57+
free(conn_cfg);
58+
return err;
6059
}

tests/tools/TestApp/src/input.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <string.h>
1111
#include "input.h"
1212

13-
const char *parse_json_to_string(const char *file_name) {
13+
char *parse_json_to_string(const char *file_name) {
1414
FILE *input_fp = fopen(file_name, "rb");
1515
if (input_fp == NULL) {
1616
perror("Failed to open a file");

tests/tools/TestApp/tx_app.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include "Inc/input.h"
77
#include "Inc/mcm.h"
88

9-
const char *client_cfg;
10-
const char *conn_cfg;
9+
char *client_cfg;
10+
char *conn_cfg;
1111

1212
int main(int argc, char **argv) {
1313
if (!is_root()) {
@@ -56,10 +56,9 @@ int main(int argc, char **argv) {
5656
mesh_delete_connection(&connection);
5757
mesh_delete_client(&client);
5858
printf("[TX] Shutdown completed. Exiting\n");
59-
goto safe_exit;
6059

6160
safe_exit:
62-
free((char *)client_cfg);
63-
free((char *)conn_cfg);
64-
return (err == 0) ? 0 : err;
61+
free(client_cfg);
62+
free(conn_cfg);
63+
return err;
6564
}

0 commit comments

Comments
 (0)