Move free from SCPI_ResultError to SCPI_SystemErrorNextQ to correspon…

…d with SCPI_ErrorPop
ardovm · Apr 24, 2016 · fdce1ea · fdce1ea
1 parent 7d6b42c
commit fdce1ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
@@ -40,6 +40,7 @@
 #include "scpi/constants.h"
 #include "scpi/error.h"
 #include "scpi/ieee488.h"
+#include "utils_private.h"
 
 /**
  * Command stub function
@@ -80,6 +81,9 @@ scpi_result_t SCPI_SystemErrorNextQ(scpi_t * context) {
     scpi_error_t error;
     SCPI_ErrorPop(context, &error);
     SCPI_ResultError(context, &error);
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+    SCPIDEFINE_free(&context->error_info_heap, error.device_dependent_info, false);
+#endif
     return SCPI_RES_OK;
 }
 

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
@@ -593,10 +593,6 @@ size_t SCPI_ResultError(scpi_t * context, scpi_error_t * error) {
     }
     result += writeData(context, "\"", 1);
 
-#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
-    SCPIDEFINE_free(&context->error_info_heap, error->device_dependent_info, false);
-#endif
-
     return result;
 }