From 86af300d4e1d08e0b4cf38b9ee376a26e1c50954 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Sun, 13 Feb 2022 16:17:41 -0600 Subject: [PATCH] Balance RETURNFUNC2 in snapshot_data.c --- src/snapshot_data.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/snapshot_data.c b/src/snapshot_data.c index 35e0e79d4..8e1e7cc40 100644 --- a/src/snapshot_data.c +++ b/src/snapshot_data.c @@ -72,10 +72,10 @@ static int snapshot_serialize_rig(cJSON *rig_node, RIG *rig) goto error; } - RETURNFUNC(RIG_OK); + RETURNFUNC2(RIG_OK); error: - RETURNFUNC(-RIG_EINTERNAL); + RETURNFUNC2(-RIG_EINTERNAL); } static int snapshot_serialize_vfo(cJSON *vfo_node, RIG *rig, vfo_t vfo) @@ -156,10 +156,10 @@ static int snapshot_serialize_vfo(cJSON *vfo_node, RIG *rig, vfo_t vfo) goto error; } - RETURNFUNC(RIG_OK); + RETURNFUNC2(RIG_OK); error: - RETURNFUNC(-RIG_EINTERNAL); + RETURNFUNC2(-RIG_EINTERNAL); } static int snapshot_serialize_spectrum(cJSON *spectrum_node, RIG *rig, @@ -283,10 +283,10 @@ static int snapshot_serialize_spectrum(cJSON *spectrum_node, RIG *rig, goto error; } - RETURNFUNC(RIG_OK); + RETURNFUNC2(RIG_OK); error: - RETURNFUNC(-RIG_EINTERNAL); + RETURNFUNC2(-RIG_EINTERNAL); } int snapshot_serialize(size_t buffer_length, char *buffer, RIG *rig, @@ -309,7 +309,7 @@ int snapshot_serialize(size_t buffer_length, char *buffer, RIG *rig, if (root_node == NULL) { - RETURNFUNC(-RIG_EINTERNAL); + RETURNFUNC2(-RIG_EINTERNAL); } node = cJSON_AddStringToObject(root_node, "app", PACKAGE_NAME); @@ -413,14 +413,14 @@ int snapshot_serialize(size_t buffer_length, char *buffer, RIG *rig, if (!bool_result) { - RETURNFUNC(-RIG_EINVAL); + RETURNFUNC2(-RIG_EINVAL); } rig->state.snapshot_packet_sequence_number++; - RETURNFUNC(RIG_OK); + RETURNFUNC2(RIG_OK); error: cJSON_Delete(root_node); - RETURNFUNC(-RIG_EINTERNAL); + RETURNFUNC2(-RIG_EINTERNAL); }