diff options
| author | Christian Muck <christian.muck@bmw.de> | 2012-01-13 12:18:26 +0100 |
|---|---|---|
| committer | Christian Muck <christian.muck@bmw.de> | 2012-01-13 12:18:26 +0100 |
| commit | b76b2015be53c8abe86b5ce51380224718959d90 (patch) | |
| tree | ae00a31b7329eca71dba2636f672054576950d82 /src/shared | |
| parent | 3d3de8d77645d2b7186dc58830d4cb94a3bcb0da (diff) | |
| download | DLT-daemon-b76b2015be53c8abe86b5ce51380224718959d90.tar.gz | |
[GSW-135] Fixed compile warnings
Diffstat (limited to 'src/shared')
| -rwxr-xr-x | src/shared/dlt_common.c | 11 | ||||
| -rw-r--r-- | src/shared/dlt_shm.c | 5 |
2 files changed, 7 insertions, 9 deletions
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 */ } |