diff options
| author | Frederic Berat <fberat@de.adit-jv.com> | 2016-02-17 11:38:37 +0100 |
|---|---|---|
| committer | Gernot Wirschal <gernot.wirschal@bmw.de> | 2016-04-28 13:41:09 +0200 |
| commit | 793f30a629d706bc6d8a47ca90d4627791bc3969 (patch) | |
| tree | d1aa92538f1b29afeaa979d7a8d508f8456f42a1 | |
| parent | df57c468df1f7f2e2f38f3db3c087cc4ca56fed1 (diff) | |
| download | DLT-daemon-793f30a629d706bc6d8a47ca90d4627791bc3969.tar.gz | |
dlt-daemon: Fix user log handler return value
The user log message handler was returning 1 instead of -1 in case of
failure, which was not expected.
Signed-off-by: Frederic Berat <fberat@de.adit-jv.com>
Change-Id: Id03b2879f631e804f9939a9f52132be26491f888
| -rw-r--r-- | src/daemon/dlt-daemon.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index d03cd02..25feb6c 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -1927,7 +1927,7 @@ int dlt_daemon_process_user_messages(DltDaemon *daemon, } /* look through buffer as long as data is in there */ - while ((receiver->bytesRcvd > min_size) && run_loop) + while ((receiver->bytesRcvd >= min_size) && run_loop) { dlt_daemon_process_user_message_func func = NULL; @@ -1935,7 +1935,7 @@ int dlt_daemon_process_user_messages(DltDaemon *daemon, userheader = (DltUserHeader*) (receiver->buf + offset); while (!dlt_user_check_userheader(userheader) && - (offset + min_size < receiver->bytesRcvd)) + (offset + min_size <= receiver->bytesRcvd)) /* resync if necessary */ { userheader = (DltUserHeader*) (receiver->buf + offset); @@ -2510,7 +2510,7 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, if ((daemon == NULL) || (daemon_local == NULL) || (rec == NULL)) { dlt_log(LOG_ERR, "Invalid function parameters used for function dlt_daemon_process_user_message_log()\n"); - return -DLT_DAEMON_ERROR_UNKNOWN; + return DLT_DAEMON_ERROR_UNKNOWN; } ret = dlt_message_read(&(daemon_local->msg), @@ -2531,7 +2531,7 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, or the headers are corrupted (error case). */ dlt_log(LOG_DEBUG,"Can't read messages from receiver\n"); } - return -DLT_DAEMON_ERROR_UNKNOWN; + return DLT_DAEMON_ERROR_UNKNOWN; } /* set overwrite ecu id */ @@ -2543,7 +2543,7 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, if (dlt_message_set_extraparameters(&(daemon_local->msg),0) == DLT_RETURN_ERROR) { dlt_log(LOG_WARNING,"Can't set message extra parameters in process user message log\n"); - return -DLT_DAEMON_ERROR_UNKNOWN; + return DLT_DAEMON_ERROR_UNKNOWN; } /* Correct value of timestamp, this was changed by dlt_message_set_extraparameters() */ @@ -2556,7 +2556,7 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, if (dlt_set_storageheader(daemon_local->msg.storageheader,daemon_local->msg.headerextra.ecu) == DLT_RETURN_ERROR) { dlt_log(LOG_WARNING,"Can't set storage header in process user message log\n"); - return -DLT_DAEMON_ERROR_UNKNOWN; + return DLT_DAEMON_ERROR_UNKNOWN; } } else @@ -2564,7 +2564,7 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, if (dlt_set_storageheader(daemon_local->msg.storageheader,daemon->ecuid) == DLT_RETURN_ERROR) { dlt_log(LOG_WARNING,"Can't set storage header in process user message log\n"); - return -DLT_DAEMON_ERROR_UNKNOWN; + return DLT_DAEMON_ERROR_UNKNOWN; } } @@ -2626,7 +2626,7 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, if (dlt_receiver_remove(rec, bytes_to_be_removed) == -1) { dlt_log(LOG_WARNING,"Can't remove bytes from receiver\n"); - return -DLT_DAEMON_ERROR_UNKNOWN; + return DLT_DAEMON_ERROR_UNKNOWN; } return DLT_DAEMON_ERROR_OK; |