console :fix conversion warnings

 - Explicit type conversion from 'signed' to 'unsigned'

Signed-off-by: Dinh Cong Toan(RBVH/ECM12) <Toan.DinhCong@vn.bosch.com>

9 files changed, 48 insertions, 48 deletions

diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c
index dbb52b1..f4c66cd 100644
--- a/src/console/dlt-control-common.c
+++ b/src/console/dlt-control-common.c
@@ -88,7 +88,7 @@ static pthread_cond_t answer_cond = PTHREAD_COND_INITIALIZER;
 
 static int local_verbose;
 static char local_ecuid[DLT_CTRL_ECUID_LEN]; /* Name of ECU */
-static long local_timeout;
+static int local_timeout;
 
 int get_verbosity(void)
 {
@@ -130,12 +130,12 @@ void set_ecuid(char *ecuid)
     }
 }
 
-long get_timeout(void)
+int get_timeout(void)
 {
     return local_timeout;
 }
 
-void set_timeout(long t)
+void set_timeout(int t)
 {
     local_timeout = DLT_CTRL_TIMEOUT;
 
@@ -251,16 +251,16 @@ static int dlt_control_send_message_to_socket(int sock, DltMessage *msg)
  */
 static int prepare_extra_headers(DltMessage *msg, uint8_t *header)
 {
-    int shift = 0;
+    uint32_t shift = 0;
 
     pr_verbose("Preparing extra headers.\n");
 
     if (!msg || !header)
         return -1;
 
-    shift = sizeof(DltStorageHeader) +
+    shift = (uint32_t) (sizeof(DltStorageHeader) +
         sizeof(DltStandardHeader) +
-        DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp);
+        DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp));
 
     /* Set header extra parameters */
     dlt_set_id(msg->headerextra.ecu, get_ecuid());
@@ -326,12 +326,12 @@ static int prepare_headers(DltMessage *msg, uint8_t *header)
     msg->standardheader->mcnt = 0;
 
     /* prepare length information */
-    msg->headersize = sizeof(DltStorageHeader) +
+    msg->headersize = (uint32_t) (sizeof(DltStorageHeader) +
         sizeof(DltStandardHeader) +
         sizeof(DltExtendedHeader) +
-        DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp);
+        DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp));
 
-    len = msg->headersize - sizeof(DltStorageHeader) + msg->datasize;
+    len = (uint32_t) (msg->headersize - sizeof(DltStorageHeader) + msg->datasize);
 
     if (len > UINT16_MAX) {
         pr_error("Message header is too long.\n");
@@ -377,7 +377,7 @@ static DltMessage *dlt_control_prepare_message(DltControlMsgBody *data)
     }
 
     /* prepare payload of data */
-    msg->databuffersize = msg->datasize = data->size;
+    msg->databuffersize = msg->datasize = (uint32_t) data->size;
 
     /* Allocate memory for Dlt Message's buffer */
     msg->databuffer = (uint8_t *)calloc(1, data->size);
@@ -515,7 +515,7 @@ static int dlt_control_callback(DltMessage *message, void *data)
     pthread_mutex_lock(&answer_lock);
     callback_return = response_analyzer_cb(text,
                                            message->databuffer,
-                                           message->datasize);
+                                           (int) message->datasize);
     pthread_cond_signal(&answer_cond);
     pthread_mutex_unlock(&answer_lock);
 
diff --git a/src/console/dlt-control-common.h b/src/console/dlt-control-common.h
index a1ba952..41606bb 100644
--- a/src/console/dlt-control-common.h
+++ b/src/console/dlt-control-common.h
@@ -55,7 +55,7 @@
 typedef struct
 {
     void *data; /**< data to be send to DLT Daemon */
-    int size;   /**< size of that data */
+    uint32_t size;   /**< size of that data */
 } DltControlMsgBody;
 
 /* As verbosity, ecuid and timeout are needed during the communication,
@@ -68,8 +68,8 @@ void set_verbosity(int);
 char *get_ecuid(void);
 void set_ecuid(char *);
 
-long get_timeout(void);
-void set_timeout(long);
+int get_timeout(void);
+void set_timeout(int);
 
 /* Parse dlt.conf file and return the value of requested configuration */
 int dlt_parse_config_param(char *config_id, char **config_data);
diff --git a/src/console/dlt-control.c b/src/console/dlt-control.c
index 3680fd9..106e2a3 100644
--- a/src/console/dlt-control.c
+++ b/src/console/dlt-control.c
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
         }
         case 'l':
         {
-            dltdata.lvalue = strtol(optarg, &endptr, 10);
+            dltdata.lvalue = (int) strtol(optarg, &endptr, 10);
 
             if ((dltdata.lvalue < DLT_LOG_DEFAULT) || (dltdata.lvalue > DLT_LOG_VERBOSE)) {
                 fprintf (stderr, "invalid log level, supported log level 0-6\n");
@@ -388,7 +388,7 @@ int main(int argc, char *argv[])
         }
         case 'r':
         {
-            dltdata.rvalue = strtol(optarg, &endptr, 10);
+            dltdata.rvalue = (int) strtol(optarg, &endptr, 10);
 
             if ((dltdata.rvalue < DLT_TRACE_STATUS_DEFAULT) || (dltdata.rvalue > DLT_TRACE_STATUS_ON)) {
                 fprintf (stderr, "invalid trace status, supported trace status -1, 0, 1\n");
@@ -552,9 +552,9 @@ int main(int argc, char *argv[])
             if (dlt_client_send_inject_msg(&g_dltclient,
                                            dltdata.avalue,
                                            dltdata.cvalue,
-                                           dltdata.svalue,
+                                           (uint32_t) dltdata.svalue,
                                            (uint8_t *)dltdata.mvalue,
-                                           strlen(dltdata.mvalue)) != DLT_RETURN_OK) {
+                                           (uint32_t) strlen(dltdata.mvalue)) != DLT_RETURN_OK) {
                 fprintf(stderr, "ERROR: Could not send inject message\n");
                 ret = -1;
             }
@@ -576,8 +576,8 @@ int main(int argc, char *argv[])
             if (dlt_client_send_inject_msg(&g_dltclient,
                                            dltdata.avalue,
                                            dltdata.cvalue,
-                                           dltdata.svalue,
-                                           buffer, size) != DLT_RETURN_OK) {
+                                           (uint32_t) dltdata.svalue,
+                                            buffer, (uint32_t)size) != DLT_RETURN_OK) {
                 fprintf(stderr, "ERROR: Could not send inject message\n");
                 ret = -1;
             }
@@ -591,7 +591,7 @@ int main(int argc, char *argv[])
                 }
 
                 if (0 != dlt_client_send_all_log_level(&g_dltclient,
-                                                       dltdata.lvalue)) {
+                                                       (uint8_t) dltdata.lvalue)) {
                     fprintf(stderr, "ERROR: Could not send log level\n");
                     ret = -1;
                 }
@@ -609,7 +609,7 @@ int main(int argc, char *argv[])
                 if (0 != dlt_client_send_log_level(&g_dltclient,
                                                    dltdata.avalue,
                                                    dltdata.cvalue,
-                                                   dltdata.lvalue)) {
+                                                   (uint8_t) dltdata.lvalue)) {
                     fprintf(stderr, "ERROR: Could not send log level\n");
                     ret = -1;
                 }
@@ -624,7 +624,7 @@ int main(int argc, char *argv[])
                 }
 
                 if (0 != dlt_client_send_all_trace_status(&g_dltclient,
-                                                          dltdata.rvalue)) {
+                                                          (uint8_t) dltdata.rvalue)) {
                     fprintf(stderr, "ERROR: Could not send trace status\n");
                     ret = -1;
                 }
@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
                 if (0 != dlt_client_send_trace_status(&g_dltclient,
                                                       dltdata.avalue,
                                                       dltdata.cvalue,
-                                                      dltdata.rvalue)) {
+                                                      (uint8_t) dltdata.rvalue)) {
                     fprintf(stderr, "ERROR: Could not send trace status\n");
                     ret = -1;
                 }
@@ -655,7 +655,7 @@ int main(int argc, char *argv[])
             printf("Loglevel: %d\n", dltdata.dvalue);
 
             /* send control message in*/
-            if (dlt_client_send_default_log_level(&g_dltclient, dltdata.dvalue) != DLT_RETURN_OK) {
+            if (dlt_client_send_default_log_level(&g_dltclient, (uint8_t) dltdata.dvalue) != DLT_RETURN_OK) {
                 fprintf (stderr, "ERROR: Could not send default log level\n");
                 ret = -1;
             }
@@ -667,7 +667,7 @@ int main(int argc, char *argv[])
             printf("TraceStatus: %d\n", dltdata.fvalue);
 
             /* send control message in*/
-            if (dlt_client_send_default_trace_status(&g_dltclient, dltdata.fvalue) != DLT_RETURN_OK) {
+            if (dlt_client_send_default_trace_status(&g_dltclient, (uint8_t) dltdata.fvalue) != DLT_RETURN_OK) {
                 fprintf (stderr, "ERROR: Could not send default trace status\n");
                 ret = -1;
             }
@@ -679,7 +679,7 @@ int main(int argc, char *argv[])
             printf("Timing packets: %d\n", dltdata.ivalue);
 
             /* send control message in*/
-            if (dlt_client_send_timing_pakets(&g_dltclient, dltdata.ivalue) != DLT_RETURN_OK) {
+            if (dlt_client_send_timing_pakets(&g_dltclient, (uint8_t) dltdata.ivalue) != DLT_RETURN_OK) {
                 fprintf (stderr, "ERROR: Could not send timing packets\n");
                 ret = -1;
             }
@@ -762,7 +762,7 @@ int dlt_receive_message_callback(DltMessage *message, void *data)
 
     /* get response service id */
     ptr = message->databuffer;
-    datalength = message->datasize;
+    datalength =(int32_t) message->datasize;
 
     DLT_MSG_READ_VALUE(uint32_tmp, ptr, datalength, uint32_t);
     id = DLT_ENDIAN_GET_32(message->standardheader->htyp, uint32_tmp);
diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c
index fa42466..7d69bff 100644
--- a/src/console/dlt-convert.c
+++ b/src/console/dlt-convert.c
@@ -150,7 +150,7 @@ void empty_dir(const char *dir)
 
     if (stat(dir, &st) == 0) {
         if (S_ISDIR(st.st_mode)) {
-            n = scandir(dir, &files, NULL, alphasort);
+            n = (uint32_t) scandir(dir, &files, NULL, alphasort);
 
             /* Do not include /. and /.. */
             if (n < 2)
@@ -464,11 +464,11 @@ int main(int argc, char *argv[])
                 /* if file output enabled write message */
                 if (ovalue) {
                     iov[0].iov_base = file.msg.headerbuffer;
-                    iov[0].iov_len = file.msg.headersize;
+                    iov[0].iov_len = (uint32_t) file.msg.headersize;
                     iov[1].iov_base = file.msg.databuffer;
-                    iov[1].iov_len = file.msg.datasize;
+                    iov[1].iov_len = (uint32_t) file.msg.datasize;
 
-                    bytes_written = writev(ohandle, iov, 2);
+                    bytes_written =(int) writev(ohandle, iov, 2);
 
                     if (0 > bytes_written) {
                         printf("in main: writev(ohandle, iov, 2); returned an error!");
diff --git a/src/console/dlt-passive-node-ctrl.c b/src/console/dlt-passive-node-ctrl.c
index c3a7172..6a02667 100644
--- a/src/console/dlt-passive-node-ctrl.c
+++ b/src/console/dlt-passive-node-ctrl.c
@@ -344,7 +344,7 @@ static int parse_args(int argc, char *argv[])
             state = (int)strtol(optarg, NULL, 10);
 
             if ((state == DLT_NODE_CONNECT) || (state == DLT_NODE_DISCONNECT)) {
-                set_connection_state(state);
+                set_connection_state((unsigned int) state);
                 set_command(DLT_SERVICE_ID_PASSIVE_NODE_CONNECT);
             }
             else {
@@ -363,7 +363,7 @@ static int parse_args(int argc, char *argv[])
             set_command(DLT_SERVICE_ID_PASSIVE_NODE_CONNECTION_STATUS);
             break;
         case 't':
-            set_timeout(strtol(optarg, NULL, 10));
+            set_timeout((int) strtol(optarg, NULL, 10));
             break;
         case 'v':
             set_verbosity(1);
diff --git a/src/console/dlt-receive.c b/src/console/dlt-receive.c
index 1b5c112..0421937 100644
--- a/src/console/dlt-receive.c
+++ b/src/console/dlt-receive.c
@@ -617,12 +617,12 @@ int dlt_receive_message_callback(DltMessage *message, void *data)
         /* if file output enabled write message */
         if (dltdata->ovalue) {
             iov[0].iov_base = message->headerbuffer;
-            iov[0].iov_len = message->headersize;
+            iov[0].iov_len = (uint32_t) message->headersize;
             iov[1].iov_base = message->databuffer;
-            iov[1].iov_len = message->datasize;
+            iov[1].iov_len = (uint32_t) message->datasize;
 
             if (dltdata->climit > -1) {
-                int bytes_to_write = message->headersize + message->datasize;
+                uint32_t bytes_to_write = message->headersize + message->datasize;
 
                 if ((bytes_to_write + dltdata->totalbytes > dltdata->climit)) {
                     dlt_receive_close_output_file(dltdata);
@@ -637,7 +637,7 @@ int dlt_receive_message_callback(DltMessage *message, void *data)
                 }
             }
 
-            bytes_written = writev(dltdata->ohandle, iov, 2);
+            bytes_written = (int) writev(dltdata->ohandle, iov, 2);
 
             dltdata->totalbytes += bytes_written;
 
diff --git a/src/console/dlt-sortbytimestamp.c b/src/console/dlt-sortbytimestamp.c
index f840ef1..9419f75 100644
--- a/src/console/dlt-sortbytimestamp.c
+++ b/src/console/dlt-sortbytimestamp.c
@@ -102,7 +102,7 @@ void verbose(int level, char *msg, ...) {
             }
         }
 
-        int len = strlen(msg);
+        int len = (int) strlen(msg);
         va_list args;
         va_start (args, msg);
         vprintf(msg, args);
@@ -229,7 +229,7 @@ int main(int argc, char *argv[]) {
     uint32_t message_count = 0;
 
     uint32_t count = 0;
-    int start = 0;
+    uint32_t start = 0;
     uint32_t delta_tmsp = 0;
     uint32_t delta_systime = 0;
     size_t i;
@@ -390,7 +390,7 @@ int main(int argc, char *argv[]) {
 
     verbose(1, "Allocating memory\n");
 
-    message_count = 1 + end - begin;
+    message_count = (uint32_t) (1 + end - begin);
 
     timestamp_index = (TimestampIndex *) malloc(sizeof(TimestampIndex) * (message_count + 1));
 
diff --git a/src/console/logstorage/dlt-logstorage-common.c b/src/console/logstorage/dlt-logstorage-common.c
index 5d9c998..0c06a55 100644
--- a/src/console/logstorage/dlt-logstorage-common.c
+++ b/src/console/logstorage/dlt-logstorage-common.c
@@ -104,7 +104,7 @@ int get_default_event_type(void)
 
 void set_default_event_type(long type)
 {
-    g_options.event_type = type;
+    g_options.event_type = (int) type;
 }
 
 char *get_default_path(void)
@@ -285,7 +285,7 @@ static DltControlMsgBody *prepare_message_body(DltControlMsgBody **body,
     serv = (DltServiceOfflineLogstorage *)(*body)->data;
 
     serv->service_id = DLT_SERVICE_ID_OFFLINE_LOGSTORAGE;
-    serv->connection_type = conn_type;
+    serv->connection_type = (uint8_t) conn_type;
     /* mount_point is DLT_MOUNT_PATH_MAX + 1 long,
      * and the memory is already zeroed.
      */
diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c b/src/console/logstorage/dlt-logstorage-ctrl.c
index 6614f44..858331b 100644
--- a/src/console/logstorage/dlt-logstorage-ctrl.c
+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
@@ -308,8 +308,8 @@ static int dlt_logstorage_ctrl_setup_event_loop(void)
     while (dlt_control_init(analyze_response, get_ecuid(), get_verbosity()) &&
            !dlt_logstorage_must_exit()) {
         pr_error("Failed to initialize connection with the daemon.\n");
-        pr_error("Retrying to connect in %lds.\n", get_timeout());
-        sleep(get_timeout());
+        pr_error("Retrying to connect in %ds.\n", get_timeout());
+        sleep((unsigned int) get_timeout());
     }
 
     if (dlt_logstorage_must_exit()) {
@@ -370,8 +370,8 @@ static int dlt_logstorage_ctrl_single_request()
     while (dlt_control_init(analyze_response, get_ecuid(), get_verbosity()) &&
            !dlt_logstorage_must_exit()) {
         pr_error("Failed to initialize connection with the daemon.\n");
-        pr_error("Retrying to connect in %lds.\n", get_timeout());
-        sleep(get_timeout());
+        pr_error("Retrying to connect in %ds.\n", get_timeout());
+        sleep( (unsigned int) get_timeout());
     }
 
     pr_verbose("event type is [%d]\t device path is [%s]\n",
@@ -452,7 +452,7 @@ static int parse_args(int argc, char *argv[])
             set_default_path(optarg);
             break;
         case 't':
-            set_timeout(strtol(optarg, NULL, 10));
+            set_timeout((int) strtol(optarg, NULL, 10));
             break;
         case 'h':
             usage();