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

- Fixed memory leak for OMG

Browse Source 
- Fixed compiler warning for OMG

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4385 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Cedric Roux
2013-11-13 15:45:11 +00:00
parent b564e37985
commit b590b550a1
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/OMG/common.c
+2 -2
View File
@@ -73,7 +73,7 @@ mapping mob_type[] =
//#endif //#endif
NodePtr create_node(void) { NodePtr create_node(void) {
NodePtr ptr; NodePtr ptr;
ptr = malloc(sizeof(node_struct)); ptr = calloc(1, sizeof(node_struct));
return ptr; return ptr;
} }
@@ -91,7 +91,7 @@ double randomGen(double a, double b){
MobilityPtr create_mobility(void) { MobilityPtr create_mobility(void) {
MobilityPtr ptr; MobilityPtr ptr;
ptr = malloc(sizeof(mobility_struct)); ptr = calloc(1, sizeof(mobility_struct));
return ptr; return ptr;
} }
openair2/UTIL/OMG/storage_traci_OMG.c
+8 -8
View File
@@ -181,7 +181,7 @@ char * readString(){
char *tmp = (char *)malloc(sizeof(char) * (len)); char *tmp = (char *)malloc(sizeof(char) * (len));
char *ret = tmp; // JHNOTE: added a pointer pointing at the head of the String char *ret = tmp; // JHNOTE: added a pointer pointing at the head of the String
//printf("OMG ready to readString of length %d \n",len); //printf("OMG ready to readString of length %d \n",len);
for (i; i < len; i++) { for (; i < len; i++) {
*tmp++ = (char) readChar(); *tmp++ = (char) readChar();
} }
*tmp++ = '\0'; // makes sure it's NUL terminated *tmp++ = '\0'; // makes sure it's NUL terminated
@@ -211,7 +211,7 @@ String_list readStringList(String_list vector){
descLen = len; descLen = len;
String_list entry = NULL; String_list entry = NULL;
for (i; i < len; i++) { for (; i < len; i++) {
if (vector->string == NULL) { if (vector->string == NULL) {
char *tmp = readString(); char *tmp = readString();
//printf("OMG - 1 SUMO ID: %s \n",tmp); //printf("OMG - 1 SUMO ID: %s \n",tmp);
@@ -370,15 +370,15 @@ double readDouble(){
if (bigEndian) if (bigEndian)
{ {
// network is big endian // network is big endian
int i=0; int i = 0;
for (i; i<8; ++i) for (; i<8; ++i)
{ {
p_value[i] = readChar(); p_value[i] = readChar();
} }
} else { } else {
int i=7; int i=7;
// network is big endian // network is big endian
for (i; i>=0; --i) { for (; i>=0; --i) {
p_value[i] = readChar(); p_value[i] = readChar();
} }
} }
@@ -391,13 +391,13 @@ void writeDouble(double value){
if (bigEndian) if (bigEndian)
{ int i=0; { int i=0;
// network is big endian // network is big endian
for (i; i<8; ++i) for (; i<8; ++i)
{ {
writeChar(p_value[i]); writeChar(p_value[i]);
} }
} else {int i=7; } else {int i=7;
// network is big endian // network is big endian
for (i; i>=0; --i) for (; i>=0; --i)
{ {
writeChar(p_value[i]); writeChar(p_value[i]);
} }
@@ -420,7 +420,7 @@ storage* writePacket (unsigned char* packet, int length){
int i = 0; int i = 0;
for(i; i < length; i++) { for(; i < length; i++) {
printf("in %d round \n",i); printf("in %d round \n",i);
//storage *temp_ = (storage *)malloc(sizeof(storage)); //storage *temp_ = (storage *)malloc(sizeof(storage));