maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into bler_txoptim

Browse Source 
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
This commit is contained in:
luis_pereira87
2022-01-18 17:44:30 +00:00
parent f3399d5dde c555d3968f
commit 978b4a1728
69 changed files with 594 additions and 3366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/LISTS/list.h
+7 -2
View File
@@ -48,6 +48,8 @@
#include "UTIL/MEM/mem_block.h"
#include <common/utils/assertions.h>
//-----------------------------------------------------------------------------
void list_init (list_t* , char *);
@@ -126,10 +128,13 @@ static inline void * dataArray(varArray_t * input) {
return input+1;
}
static inline void appendVarArray(varArray_t * input, void* data) {
static inline void appendVarArray(varArray_t ** inputPtr, void* data) {
varArray_t *input=*inputPtr;
if (input->size>=input->mallocedSize) {
input->mallocedSize+=input->increment;
input=(varArray_t *)realloc(input,sizeof(varArray_t)+input->mallocedSize*input->atomSize);
*inputPtr=(varArray_t *)realloc(input,sizeof(varArray_t)+input->mallocedSize*input->atomSize);
AssertFatal(*inputPtr, "no memory left");
input=*inputPtr;
}
memcpy((uint8_t*)(input+1)+input->atomSize*input->size++, data, input->atomSize);
}