Skip to content
This repository was archived by the owner on Oct 10, 2025. It is now read-only.

Commit d12169d

Browse files
brightprogrammerbrightprogrammer
authored
List Compilation Error Fixes (#33)
1 parent 4b6f310 commit d12169d

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

‎Include/Misra/Std/Container/List/Init.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@
3636
# define ListInitWithDeepCopyT(l, ci, cd) ((TYPE_OF(l))ListInitWithDeepCopy(ci, cd))
3737
#endif
3838

39+
#define ListDeinit(v) deinit_list(GENERIC_LIST(v), sizeof(LIST_DATA_TYPE(v)))
40+
3941
#endif // MISRA_STD_CONTAINER_LIST_H

‎Include/Misra/Std/Container/List/Insert.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
#define ListInsertL(l, lval, idx) \
4444
do { \
4545
ValidateList(l); \
46-
LIST_DATA_TYPE(l) *__ptr__val_##__LINE__ = &(lval); \
47-
LIST_DATA_TYPE(l) __tmp__val_##__LINE__ = (lval); \
48-
insert_into_list(GENERIC_LIST(l), __tmp__val_##__LINE__, sizeof(LIST_DATA_TYPE(l)), (idx)); \
46+
LIST_DATA_TYPE(l) * UNPL(_ptrval) = &(lval); \
47+
LIST_DATA_TYPE(l) UNPL(_tmpval) = *UNPL(_ptrval); \
48+
insert_into_list(GENERIC_LIST(l), UNPL(_ptrval), sizeof(LIST_DATA_TYPE(l)), (idx)); \
4949
if (!(l)->copy_init) { \
50-
memset(__ptr__val_##__LINE__, 0, sizeof(LIST_DATA_TYPE(l))); \
50+
memset(UNPL(_ptrval), 0, sizeof(LIST_DATA_TYPE(l))); \
5151
} \
5252
} while (0)
5353

@@ -79,8 +79,8 @@
7979
#define ListInsertR(l, rval, idx) \
8080
do { \
8181
ValidateList(l); \
82-
LIST_DATA_TYPE(l) __tmp__val_##__LINE__ = (rval); \
83-
insert_range_into_vec(GENERIC_LIST(l), (char *)&__tmp__val_##__LINE__, sizeof(LIST_DATA_TYPE(l)), (idx), 1); \
82+
LIST_DATA_TYPE(l) UNPL(_rval) = (rval); \
83+
insert_into_list(GENERIC_LIST(l), (char *)&UNPL(_rval), sizeof(LIST_DATA_TYPE(l)), (idx)); \
8484
} while (0)
8585

8686
///
@@ -156,7 +156,7 @@
156156
/// SUCCESS: Return.
157157
/// FAILURE: Does not return.
158158
///
159-
#define ListPushFront(l, lval) ListPushFrontL((l), (lval), 0);
159+
#define ListPushFront(l, lval) ListPushFrontL((l), (lval));
160160

161161
///
162162
/// Push a l-value at the back of list.
@@ -169,7 +169,7 @@
169169
/// SUCCESS: Return
170170
/// FAILURE: Does not return
171171
///
172-
#define ListPushBack(l, lval) ListPushBackL((l), (lval), (l)->length)
172+
#define ListPushBack(l, lval) ListPushBackL((l), (lval))
173173

174174
///
175175
/// Push a complete array into this list.
@@ -187,12 +187,12 @@
187187
#define ListPushArrL(l, arr, count) \
188188
do { \
189189
ValidateList(l); \
190-
LIST_DATA_TYPE(l) *__ptr_val_##__LINE__ = (arr); \
191-
const LIST_DATA_TYPE(l) __tmp_val_##__LINE__ = *(arr); \
192-
(void)__tmp_val_##__LINE__; \
193-
push_arr_list(GENERIC_LIST(l), sizeof(LIST_DATA_TYPE(l)), __ptr_val_##__LINE__, (count)); \
190+
LIST_DATA_TYPE(l) * UNPL(_ptrval) = (arr); \
191+
const LIST_DATA_TYPE(l) UNPL(_tmpval) = *UNPL(_ptrval); \
192+
(void)UNPL(_tmpval); \
193+
push_arr_list(GENERIC_LIST(l), sizeof(LIST_DATA_TYPE(l)), UNPL(_ptrval), (count)); \
194194
if (!(l)->copy_init) { \
195-
memset(__ptr_val_##__LINE__, 0, sizeof(LIST_DATA_TYPE(l))); \
195+
memset(UNPL(_ptrval), 0, sizeof(LIST_DATA_TYPE(l))); \
196196
} \
197197
} while (0)
198198

@@ -212,11 +212,11 @@
212212
ValidateList(l); \
213213
ValidateList(l2); \
214214
{ \
215-
LIST_DATA_TYPE(l) __tmp1_##__LINE__ = {0}; \
216-
LIST_DATA_TYPE(l2) __tmp2_##__LINE__ = {0}; \
217-
__tmp1_##__LINE__ = __tmp2_##__LINE__; \
218-
(void)__tmp1_##__LINE__; \
219-
(void)__tmp2_##__LINE__; \
215+
LIST_DATA_TYPE(l) UNPL(_tmp1) = {0}; \
216+
LIST_DATA_TYPE(l2) UNPL(_tmp2) = {0}; \
217+
UNPL(_tmp1) = UNPL(_tmp2); \
218+
(void)UNPL(_tmp1); \
219+
(void)UNPL(_tmp2); \
220220
} \
221221
merge_list(GENERIC_LIST(l), sizeof(LIST_DATA_TYPE(l)), GENERIC_LIST(l2)); \
222222
if (!(l)->copy_init) { \
@@ -243,11 +243,11 @@
243243
ValidateList(l); \
244244
ValidateList(l2); \
245245
{ \
246-
LIST_DATA_TYPE(l) __tmp1_##__LINE__ = {0}; \
247-
LIST_DATA_TYPE(l2) __tmp2_##__LINE__ = {0}; \
248-
__tmp1_##__LINE__ = __tmp2_##__LINE__; \
249-
(void)__tmp1_##__LINE__; \
250-
(void)__tmp2_##__LINE__; \
246+
LIST_DATA_TYPE(l) UNPL(_tmp1) = {0}; \
247+
LIST_DATA_TYPE(l2) UNPL(_tmp2) = {0}; \
248+
UNPL(_tmp1) = UNPL(_tmp2); \
249+
(void)UNPL(_tmp1); \
250+
(void)UNPL(_tmp2); \
251251
} \
252252
merge_list(GENERIC_LIST(l), sizeof(LIST_DATA_TYPE(l)), GENERIC_LIST(l2)); \
253253
} while (0)

0 commit comments

Comments
 (0)