diff options
author | Lutz Helwing <lutz_helwing@mentor.com> | 2015-05-07 11:34:40 +0200 |
---|---|---|
committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-06-17 08:50:42 +0200 |
commit | d8125a0d7e74c58910840d0f28e891ce7ffda60e (patch) | |
tree | 5f50080ce36bf73f92526900ba1cec27f96ea824 /src/lib/dlt_user.c.rej | |
parent | 9a64599a9d864e2dc2e14832eb2f0c17a497972f (diff) | |
download | DLT-daemon-d8125a0d7e74c58910840d0f28e891ce7ffda60e.tar.gz |
Updated license headers to latest GENIVI license policy. Fixed further LRT Scan findings. Renamed and cleanup further files.
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src/lib/dlt_user.c.rej')
-rw-r--r-- | src/lib/dlt_user.c.rej | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/src/lib/dlt_user.c.rej b/src/lib/dlt_user.c.rej deleted file mode 100644 index c197d0d..0000000 --- a/src/lib/dlt_user.c.rej +++ /dev/null @@ -1,62 +0,0 @@ ---- src/lib/dlt_user.c -+++ src/lib/dlt_user.c -@@ -501,48 +501,21 @@ int dlt_user_atexit_blow_out_user_buffer(void){ - - uint32_t exitTime = dlt_uptime() + DLT_USER_ATEXIT_RESEND_BUFFER_EXIT_TIMEOUT; - -- /* Send content of ringbuffer */ -- DLT_SEM_LOCK(); -- count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); -- DLT_SEM_FREE(); -- -- if (count > 0) -- { -- while(dlt_uptime() < exitTime ) -- { -- if (dlt_user.dlt_log_handle == -1) -- { -- /* Reattach to daemon if neccesary */ -- dlt_user_log_reattach_to_daemon(); -+ while(dlt_uptime() < exitTime ){ - -- if ((dlt_user.dlt_log_handle != -1) && (dlt_user.overflow_counter)) -- { -- if (dlt_user_log_send_overflow()==0) -- { -- snprintf(str,DLT_USER_BUFFER_LENGTH,"%u messages discarded!\n",dlt_user.overflow_counter); -- dlt_log(LOG_WARNING, str); -- dlt_user.overflow_counter=0; -- } -- } -- } -- -- if (dlt_user.dlt_log_handle != -1) -- { -- ret = dlt_user_log_resend_buffer(); -+ ret = dlt_user_log_resend_buffer(); - -- if(ret == 0) -- { -- return 0; -- } -- } -+ if(ret == 0) -+ { -+ return 0; -+ } - -- usleep(DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP); -- } -+ usleep(DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP); -+ } - -- DLT_SEM_LOCK(); -- count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); -- DLT_SEM_FREE(); -- } -+ DLT_SEM_LOCK(); -+ count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); -+ DLT_SEM_FREE(); - - return count; - } |