[GSW-135] Fixed compile warnings

5 files changed, 27 insertions, 18 deletions

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index ad3fdaf..2a24478 100755
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,6 +1,6 @@
 DLT - Automotive Diagnostic Log and Trace

 

-Version: 2.4.2

+Version: 2.4.3 BETA

 

 

 Introduction

@@ -23,6 +23,12 @@ Alexander.AW.Wenzel@bmw.de
 

 Changes in this release

 -----------------------

+2.4.3 BETA

+

+Improvements

+   * [GSW-138] API Extension to resend the log messages in the user buffer fixed

+   * [GSW-135] Fixed compile warnings 

+

 2.4.2

 

 Improvements

@@ -50,7 +56,7 @@ Bugfixes
 2.4.1 

 

 Improvements

-	* Added internal logging facility to stdout, syslog or local file, configurable in configuration file.

+    * Added internal logging facility to stdout, syslog or local file, configurable in configuration file.

     * Added deamonise and signal handlers to dlt-system.

     * Added manual pages.

     * Added new API dlt_check_library_version() function.

diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 594fe39..5de8561 100755
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -337,7 +337,7 @@ void dlt_user_atexit_handler(void)
 
 	if(count != 0){
 		char tmp[256];
-		sprintf(&tmp,"Lost log messages in user buffer when exiting: %i\n",count);
+		sprintf(tmp,"Lost log messages in user buffer when exiting: %i\n",count);
 		dlt_log(LOG_ERR, tmp);
 	}
 
@@ -922,7 +922,7 @@ int dlt_forward_msg(void *msgdata,size_t size)
             DLT_SEM_LOCK();
 
             if (dlt_buffer_push3(&(dlt_user.startup_buffer),
-                                &(userheader), sizeof(DltUserHeader),
+                                (unsigned char *)&(userheader), sizeof(DltUserHeader),
                                  msgdata, size, 0, 0)==-1)
 			{
 				dlt_log(LOG_ERR,"Storing message to history buffer failed! Message discarded.\n");
@@ -2260,7 +2260,7 @@ int dlt_user_log_send_log(DltContextData *log, int mtype)
             DLT_SEM_LOCK();
 
             if (dlt_buffer_push3(&(dlt_user.startup_buffer),
-                                &(userheader), sizeof(DltUserHeader),
+                                (unsigned char *)&(userheader), sizeof(DltUserHeader),
                                 msg.headerbuffer+sizeof(DltStorageHeader), msg.headersize-sizeof(DltStorageHeader),
                                 log->buffer, log->size)==-1)
 			{
diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
index 1ebc696..6b75e79 100755
--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
@@ -2297,7 +2297,7 @@ int dlt_buffer_init_static_server(DltBuffer *buf, const unsigned char *ptr, uint
 	DltBufferHead *head;
 
 	// Init parameters
-	buf->shm = ptr;
+	buf->shm = (unsigned char *)ptr;
 	buf->min_size = size;
 	buf->max_size = size;
 	buf->step_size = 0;
@@ -2307,7 +2307,7 @@ int dlt_buffer_init_static_server(DltBuffer *buf, const unsigned char *ptr, uint
 	head->read = 0;
 	head->write = 0;
 	head->count = 0;
-    buf->mem = (char*)(buf->shm + sizeof(DltBufferHead));
+    buf->mem = (unsigned char *)(buf->shm + sizeof(DltBufferHead));
 	buf->size = buf->min_size - sizeof(DltBufferHead);
 
 	// clear memory
@@ -2322,16 +2322,15 @@ int dlt_buffer_init_static_server(DltBuffer *buf, const unsigned char *ptr, uint
 int dlt_buffer_init_static_client(DltBuffer *buf, const unsigned char *ptr, uint32_t size)
 {
 	char str[256];
-	DltBufferHead *head;
 
 	// Init parameters
-	buf->shm = ptr;
+	buf->shm = (unsigned char *)ptr;
 	buf->min_size = size;
 	buf->max_size = size;
 	buf->step_size = 0;
 	
 	// Init pointers
-    buf->mem = (char*)(buf->shm + sizeof(DltBufferHead));
+    buf->mem = (unsigned char *)(buf->shm + sizeof(DltBufferHead));
     buf->size = buf->min_size - sizeof(DltBufferHead);
 
 	snprintf(str,sizeof(str),"Buffer: Size %d\n",buf->size);
@@ -2363,7 +2362,7 @@ int dlt_buffer_init_dynamic(DltBuffer *buf, uint32_t min_size, uint32_t max_size
 	head->read = 0;
 	head->write = 0;
 	head->count = 0;
-    buf->mem = (char*)(buf->shm + sizeof(DltBufferHead));
+    buf->mem = (unsigned char *)(buf->shm + sizeof(DltBufferHead));
     buf->size = buf->min_size - sizeof(DltBufferHead);
 
 	// clear memory
diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c
index f330864..c22dd13 100644
--- a/src/shared/dlt_shm.c
+++ b/src/shared/dlt_shm.c
@@ -109,7 +109,6 @@ void dlt_shm_pv(int id,int operation)
 
 int dlt_shm_init_server(DltShm *buf,int key,int size) {
 	struct shmid_ds shm_buf;
-	char str[256];
 	unsigned char *ptr;
 
 	// Init parameters
@@ -130,7 +129,7 @@ int dlt_shm_init_server(DltShm *buf,int key,int size) {
 	}	
 
     // Now we attach the segment to our data space.
-    if ((ptr = shmat(buf->shmid, NULL, 0)) == (char *) -1) {
+    if ((ptr = shmat(buf->shmid, NULL, 0)) == (unsigned char *) -1) {
         dlt_log(LOG_ERR,"SHM: shmat");
         return -1; /* ERROR */
     }
@@ -175,7 +174,7 @@ int dlt_shm_init_client(DltShm *buf,int key) {
 	}	
 
 	// Now we attach the segment to our data space.
-	if ((ptr = shmat(buf->shmid, NULL, 0)) == (char *) -1) {
+	if ((ptr = shmat(buf->shmid, NULL, 0)) == (unsigned char *) -1) {
 		dlt_log(LOG_ERR,"shmat");
 		return -1; /* ERROR */
 	}
diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c
index c2df24c..2902363 100755
--- a/src/system/dlt-system.c
+++ b/src/system/dlt-system.c
@@ -378,7 +378,8 @@ int dlt_system_parse_configuration(DltSystemOptions *options)
 
 void dlt_system_daemonize()
 {
-    int i,lfp,bytes_written,ret;
+    int i,ret;
+    //int lfp,bytes_written;
 
     /* Daemonize */
     i=fork();
@@ -499,6 +500,7 @@ void dlt_system_signal_handler(int sig)
 int dlt_user_injection_callback(uint32_t service_id, void *data, uint32_t length)
 {
     char text[1024];
+    int syserr = 0;
 
 	strncpy(text,data,length);
 
@@ -508,7 +510,10 @@ int dlt_user_injection_callback(uint32_t service_id, void *data, uint32_t length
 			/* Execute shell command */
 			//DLT_LOG(shellContext, DLT_LOG_INFO, DLT_STRING("Execute command:"), DLT_STRING(text));
 			printf("Execute command: %s\n",text);
-			system(text);
+			if((syserr = system(text)) != 0)
+			{
+				printf("Abnormal exit status from %s: %d\n",text,syserr);
+			}
 			break;
 		default:
 			//DLT_LOG(shellContext, DLT_LOG_WARN, DLT_STRING("Unknown command received! Service ID:"), DLT_UINT32(service_id),DLT_STRING("Command:"),DLT_STRING(text));
@@ -526,7 +531,7 @@ int dlt_user_injection_callback(uint32_t service_id, void *data, uint32_t length
 
 int main(int argc, char* argv[])
 {
-    int sock;
+    int sock = -1;
     int bytes_read;
     socklen_t addr_len;
     char recv_data[MAXSTRLEN];
@@ -593,7 +598,7 @@ int main(int argc, char* argv[])
 			perror("Socket");
 			exit(1);
 		}
-			server_addr.sin_family = AF_INET;
+		server_addr.sin_family = AF_INET;
 		server_addr.sin_port = htons(options.SyslogPort);
 		server_addr.sin_addr.s_addr = INADDR_ANY;
 		bzero(&(server_addr.sin_zero), 8);