From ee278550a3d989b18f8378cd59a52efd7277da65 Mon Sep 17 00:00:00 2001
From: Tommy Olofsson <tommy.olofsson.90@gmail.com>
Date: Wed, 16 Apr 2014 13:09:07 +0200
Subject: [PATCH] Cleaned up error reporting in decoder.
---
lib/c/labcomm_decoder.c | 10 ++++------
lib/c/labcomm_error.c | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/c/labcomm_decoder.c b/lib/c/labcomm_decoder.c
index 0447ae5..0de42d3 100644
--- a/lib/c/labcomm_decoder.c
+++ b/lib/c/labcomm_decoder.c
@@ -202,9 +202,8 @@ static int decode_typedef_or_sample(struct labcomm_decoder *d, int kind)
LABCOMM_IOCTL_WRITER_GET_BYTES_WRITTEN,
&signature.size);
if (err < 0) {
- printf("Failed to get size: %s\n", strerror(-err));
- /* labcomm_error_fatal_global(LABCOMM_ERROR_BAD_WRITER, */
- /* "Failed to get size: %s\n", strerror(-err)); */
+ d->on_error(LABCOMM_ERROR_BAD_WRITER, 2,
+ "Failed to get size: %s\n", strerror(-err));
result = -ENOENT;
goto free_signature_name;
}
@@ -212,9 +211,8 @@ static int decode_typedef_or_sample(struct labcomm_decoder *d, int kind)
LABCOMM_IOCTL_WRITER_GET_BYTE_POINTER,
&signature.signature);
if (err < 0) {
- printf("Failed to get pointer: %s\n", strerror(-err));
- /* labcomm_error_fatal_global(LABCOMM_ERROR_BAD_WRITER, */
- /* "Failed to get pointer: %s\n", strerror(-err)); */
+ d->on_error(LABCOMM_ERROR_BAD_WRITER, 2,
+ "Failed to get pointer: %s\n", strerror(-err));
result = -ENOENT;
goto free_signature_name;
}
diff --git a/lib/c/labcomm_error.c b/lib/c/labcomm_error.c
index 9cae3e7..278c5f3 100644
--- a/lib/c/labcomm_error.c
+++ b/lib/c/labcomm_error.c
@@ -27,6 +27,6 @@ void labcomm_error_fatal_global(enum labcomm_error error,
char *format,
...)
{
- printf("Fatal error %d\n", error);
+ fprintf(stderr, "Fatal error %d\n", error);
exit(1);
}
--
GitLab