diff options
author | Lutz Helwing <lutz_helwing@mentor.com> | 2015-07-15 14:14:19 +0200 |
---|---|---|
committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-10-07 10:40:33 +0200 |
commit | 1236195e9b93aeb6bfa625956fa027f96003756d (patch) | |
tree | 07b08c892a486f9f97c1674e0d253099eb3388f3 /src/daemon/dlt_daemon_socket.c | |
parent | 033a69218af3490f6be409f66f350c1568655f61 (diff) | |
download | DLT-daemon-1236195e9b93aeb6bfa625956fa027f96003756d.tar.gz |
DLT daemon improvement - dlt_init()-check
DLT daemon improvement - parameter value range check
Adapt unit tests to check for enum return values
Changed C version to gnu99 and C++ version to gnu++0c
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src/daemon/dlt_daemon_socket.c')
-rw-r--r-- | src/daemon/dlt_daemon_socket.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c index fa91485..1054e9a 100644 --- a/src/daemon/dlt_daemon_socket.c +++ b/src/daemon/dlt_daemon_socket.c @@ -133,35 +133,35 @@ int dlt_daemon_socket_open(int *sock, unsigned int servPort) int dlt_daemon_socket_close(int sock) { - close(sock); + close(sock); - return 0; + return 0; } int dlt_daemon_socket_send(int sock,void* data1,int size1,void* data2,int size2,char serialheader) { - /* Optional: Send serial header, if requested */ - if (serialheader) - { - if ( 0 > send(sock, dltSerialHeader,sizeof(dltSerialHeader),0) ) - return DLT_DAEMON_ERROR_SEND_FAILED; - - } - - /* Send data */ - if(data1 && size1>0) - { - if (0 > send(sock, data1,size1,0)) - return DLT_DAEMON_ERROR_SEND_FAILED; - } - - if(data2 && size2>0) - { - if (0 > send(sock, data2,size2,0)) - return DLT_DAEMON_ERROR_SEND_FAILED; - } - - return DLT_DAEMON_ERROR_OK; + /* Optional: Send serial header, if requested */ + if (serialheader) + { + if ( 0 > send(sock, dltSerialHeader,sizeof(dltSerialHeader),0) ) + return DLT_DAEMON_ERROR_SEND_FAILED; + + } + + /* Send data */ + if(data1 && size1>0) + { + if (0 > send(sock, data1,size1,0)) + return DLT_DAEMON_ERROR_SEND_FAILED; + } + + if(data2 && size2>0) + { + if (0 > send(sock, data2,size2,0)) + return DLT_DAEMON_ERROR_SEND_FAILED; + } + + return DLT_DAEMON_ERROR_OK; } int dlt_daemon_socket_get_send_qeue_max_size(int sock) |