diff options
| -rwxr-xr-x | include/dlt/dlt_common.h | 6 | ||||
| -rw-r--r-- | src/daemon/dlt-daemon.c | 3 | ||||
| -rwxr-xr-x | src/shared/dlt_common.c | 25 |
3 files changed, 16 insertions, 18 deletions
diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index 73798b7..2288f69 100755 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -602,9 +602,9 @@ typedef struct typedef struct { - unsigned char* shm; /* pointer to beginning of shared memory */ - int size; /* size of data area in shared memory */ - unsigned char* mem; /* pointer to data area in shared memory */ + unsigned char* shm; /* pointer to beginning of shared memory */ + int size; /* size of data area in shared memory */ + unsigned char* mem; /* pointer to data area in shared memory */ uint32_t min_size; /**< Minimum size of buffer */ uint32_t max_size; /**< Maximum size of buffer */ diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 40be7d6..675d958 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -1165,9 +1165,6 @@ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local, cha uint32_t uiType; uint16_t uiSize; uint32_t uiExtraSize; - int sent; - int j; - int third_value; int ret; PRINT_FUNCTION_VERBOSE(verbose); diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 8f59b67..f9dee4c 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -28,10 +28,11 @@ */ #include <stdio.h> -#include <stdlib.h> /* for malloc(), free() */ -#include <string.h> /* for strlen(), memcmp(), memmove() */ -#include <time.h> /* for localtime(), strftime() */ -#include <limits.h> /* for NAME_MAX */ +#include <stdlib.h> /* for malloc(), free() */ +#include <string.h> /* for strlen(), memcmp(), memmove() */ +#include <time.h> /* for localtime(), strftime() */ +#include <limits.h> /* for NAME_MAX */ +#include <inttypes.h> /* for PRI formatting macro */ #include "dlt_common.h" #include "dlt_common_cfg.h" @@ -259,7 +260,7 @@ int dlt_print_char_string(char **text,int textlength,uint8_t *ptr,int size) if (textlength< size) { char str[255]; - sprintf(str, 254, "String does not fit character data (available=%d, required=%d) !\n", textlength, size); + snprintf(str, 254, "String does not fit character data (available=%d, required=%d) !\n", textlength, size); dlt_log(LOG_WARNING, str); return -1; } @@ -958,7 +959,7 @@ int dlt_message_payload(DltMessage *msg,char *text,int textlength,int type,int v if (textlength<((datalength*3)+20)) { char str[255]; - sprintf(str, 254, "String does not fit binary data (available=%d, required=%d) !\n", textlength, (datalength*3)+20); + snprintf(str, 254, "String does not fit binary data (available=%d, required=%d) !\n", textlength, (datalength*3)+20); dlt_log(LOG_WARNING, str); return -1; } @@ -1752,7 +1753,7 @@ int dlt_file_read(DltFile *file,int verbose) { snprintf(str,DLT_COMMON_BUFFER_LENGTH,"Seek failed to skip extra header and payload data from file of size %d!\n", - file->msg.headersize - sizeof(DltStorageHeader) - sizeof(DltStandardHeader) + file->msg.datasize); + file->msg.headersize - (int32_t)sizeof(DltStorageHeader) - (int32_t)sizeof(DltStandardHeader) + file->msg.datasize); dlt_log(LOG_WARNING, str); /* go back to last position in file */ if (fseek(file->handle,file->file_position,SEEK_SET)) @@ -2058,14 +2059,14 @@ int dlt_log(int prio, char *s) /* log to syslog */ #if !defined (__WIN32__) && !defined(_MSC_VER) openlog("DLT",LOG_PID,LOG_DAEMON); - syslog(prio, sFormatString, (unsigned int)sTimeSpec.tv_sec, (unsigned int)(sTimeSpec.tv_nsec/1000), getpid(), getpid(), asSeverity[prio], s); + syslog(prio, sFormatString, (unsigned int)sTimeSpec.tv_sec, (unsigned int)(sTimeSpec.tv_nsec/1000), getpid(), asSeverity[prio], s); closelog(); #endif break; case DLT_LOG_TO_FILE: /* log to file */ if(logging_handle) { - fprintf(logging_handle,sFormatString, (unsigned int)sTimeSpec.tv_sec, (unsigned int)(sTimeSpec.tv_nsec/1000), getpid(), getpid(), asSeverity[prio], s); + fprintf(logging_handle,sFormatString, (unsigned int)sTimeSpec.tv_sec, (unsigned int)(sTimeSpec.tv_nsec/1000), getpid(), asSeverity[prio], s); fflush(logging_handle); } break; @@ -2521,7 +2522,7 @@ int dlt_buffer_increase_size(DltBuffer *buf) buf->mem = new_ptr+sizeof(DltBufferHead); buf->size += buf->step_size; - snprintf(str,sizeof(str),"Buffer: Size increased to %d bytes\n",buf->size+sizeof(DltBufferHead)); + snprintf(str,sizeof(str),"Buffer: Size increased to %d bytes\n",buf->size+(int32_t)sizeof(DltBufferHead)); dlt_log(LOG_DEBUG, str); return 0; // OK @@ -3542,7 +3543,7 @@ int dlt_message_argument_print(DltMessage *msg,uint32_t type_info,uint8_t **ptr, #if defined (__WIN32__) && !defined(_MSC_VER) snprintf(text+strlen(text),textlength-strlen(text),"%I64d",value64i); #else - snprintf(text+strlen(text),textlength-strlen(text),"%lld",value64i); + snprintf(text+strlen(text),textlength-strlen(text),"%"PRId64, value64i); #endif } else @@ -3556,7 +3557,7 @@ int dlt_message_argument_print(DltMessage *msg,uint32_t type_info,uint8_t **ptr, #if defined (__WIN32__) && !defined(_MSC_VER) snprintf(text+strlen(text),textlength-strlen(text),"%I64u",value64u); #else - snprintf(text+strlen(text),textlength-strlen(text),"%llu",value64u); + snprintf(text+strlen(text),textlength-strlen(text),"%"PRId64,value64u); #endif } break; |