diff options
Diffstat (limited to 'src/fruits')
| -rw-r--r-- | src/fruits/cmc/cmc.c | 12 | ||||
| -rw-r--r-- | src/fruits/cmv/cmv.c | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/fruits/cmc/cmc.c b/src/fruits/cmc/cmc.c index 0529f81..1baae8f 100644 --- a/src/fruits/cmc/cmc.c +++ b/src/fruits/cmc/cmc.c @@ -214,7 +214,7 @@ static void client_callback(void *userdata, u8 op, void *opaque) u32 size = nn_packet_read_u32(packet); u8 *ptr; NNWT_PACKET_READ_DATA(packet, size, ptr); - entry->raw.data = al_malloc(size); + entry->raw.data = (u8 *)al_malloc(size); al_memcpy(entry->raw.data, ptr, size); entry->raw.sample_count = nn_packet_read_u32(packet); cmc_ui_queue_render(&c->ui); @@ -269,7 +269,7 @@ s32 main(s32 argc, char *argv[]) al_array_init(c.cli.args); if (!parse_command_line(argc, argv)) { - return EXIT_FAILURE; + goto err; } nn_event_loop_init(&c.loop); @@ -281,12 +281,18 @@ s32 main(s32 argc, char *argv[]) c.client.callback = client_callback; c.client.userdata = &c; if (!camu_client_login(&c.client, &al_str_c("andrew"), &c.loop, CAMU_TEST_TYPE, &CAMU_TEST_ADDR, CAMU_PORT)) { - return EXIT_FAILURE; + goto err; } nn_event_loop_run(&c.loop); cmc_ui_close(&c.ui); + nn_common_close(); + return EXIT_SUCCESS; +err: + nn_common_close(); + + return EXIT_FAILURE; } diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c index 727261b..6875dd1 100644 --- a/src/fruits/cmv/cmv.c +++ b/src/fruits/cmv/cmv.c @@ -232,7 +232,9 @@ s32 wmain(s32 argc, wchar_t **argv) s32 main(s32 argc, char *argv[]) #endif { - if (!nn_common_init("cmv_main") || !stl_global_init(false)) { + if (!nn_common_init("cmv_main")) return EXIT_FAILURE; + if (!stl_global_init(false)) { + nn_common_close(); return EXIT_FAILURE; } |