|
| 1 | +From 972fbd3dd1e1f4cdaccdb181373932f1b68fc23b Mon Sep 17 00:00:00 2001 |
| 2 | +From: Leonardo Rossetti <lrossett@redhat.com> |
| 3 | +Date: Tue, 30 Jun 2026 04:35:02 -0300 |
| 4 | +Subject: [PATCH 4/4] fix enum-int-mismatch |
| 5 | + |
| 6 | +Signed-off-by: Leonardo Rossetti <lrossett@redhat.com> |
| 7 | +--- |
| 8 | + src/lib/dlt_client.c | 4 ++-- |
| 9 | + src/shared/dlt_common.c | 2 +- |
| 10 | + src/shared/dlt_shm.c | 4 ++-- |
| 11 | + 3 files changed, 5 insertions(+), 5 deletions(-) |
| 12 | + |
| 13 | +diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c |
| 14 | +index 720aa27..7013ccf 100644 |
| 15 | +--- a/src/lib/dlt_client.c |
| 16 | ++++ b/src/lib/dlt_client.c |
| 17 | +@@ -107,7 +107,7 @@ void dlt_client_register_message_callback(int (*registerd_callback)(DltMessage* |
| 18 | + message_callback_function = registerd_callback; |
| 19 | + } |
| 20 | + |
| 21 | +-DltReturnValue dlt_client_init_port(DltClient* client, int port, int verbose) |
| 22 | ++int dlt_client_init_port(DltClient* client, int port, int verbose) |
| 23 | + { |
| 24 | + if (verbose && port != DLT_DAEMON_TCP_PORT) |
| 25 | + { |
| 26 | +@@ -792,7 +792,7 @@ DltReturnValue dlt_client_send_default_log_level(DltClient* client, uint8_t defa |
| 27 | + return DLT_RETURN_OK; |
| 28 | + } |
| 29 | + |
| 30 | +-DltReturnValue dlt_client_send_all_log_level(DltClient* client, uint8_t LogLevel) |
| 31 | ++int dlt_client_send_all_log_level(DltClient* client, uint8_t LogLevel) |
| 32 | + { |
| 33 | + DltServiceSetDefaultLogLevel* req; |
| 34 | + uint8_t* payload; |
| 35 | +diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c |
| 36 | +index 4b70300..322fdd6 100644 |
| 37 | +--- a/src/shared/dlt_common.c |
| 38 | ++++ b/src/shared/dlt_common.c |
| 39 | +@@ -2720,7 +2720,7 @@ DltReturnValue dlt_buffer_push(DltBuffer *buf,const unsigned char *data,unsigned |
| 40 | + return dlt_buffer_push3(buf, data, size, 0, 0, 0, 0); |
| 41 | + } |
| 42 | + |
| 43 | +-int dlt_buffer_push3(DltBuffer *buf, const unsigned char *data1, unsigned int size1, const unsigned char *data2, unsigned int size2, const unsigned char *data3, unsigned int size3) |
| 44 | ++DltReturnValue dlt_buffer_push3(DltBuffer *buf, const unsigned char *data1, unsigned int size1, const unsigned char *data2, unsigned int size2, const unsigned char *data3, unsigned int size3) |
| 45 | + { |
| 46 | + int free_size; |
| 47 | + int write, read, count; |
| 48 | +diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c |
| 49 | +index 78e5951..700ffaa 100644 |
| 50 | +--- a/src/shared/dlt_shm.c |
| 51 | ++++ b/src/shared/dlt_shm.c |
| 52 | +@@ -96,7 +96,7 @@ void dlt_shm_pv(int id,int operation) |
| 53 | + } |
| 54 | + } |
| 55 | + |
| 56 | +-int dlt_shm_init_server(DltShm *buf,int key,int size) { |
| 57 | ++DltReturnValue dlt_shm_init_server(DltShm *buf,int key,int size) { |
| 58 | + struct shmid_ds shm_buf; |
| 59 | + unsigned char *ptr; |
| 60 | + |
| 61 | +@@ -275,7 +275,7 @@ int dlt_shm_remove(DltShm *buf) |
| 62 | + return ret; |
| 63 | + } |
| 64 | + |
| 65 | +-DltReturnValue dlt_shm_free_server(DltShm *buf) { |
| 66 | ++int dlt_shm_free_server(DltShm *buf) { |
| 67 | + |
| 68 | + if(shmdt(buf->buffer.shm)) { |
| 69 | + dlt_log(LOG_WARNING,"SHM: shmdt() failed"); |
| 70 | +-- |
| 71 | +2.54.0 |
| 72 | + |
0 commit comments