Fix compile error when --build-e2 option included
- modify byte_array.h in order to avoid conflict for same file names
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
#include "byte_array.h"
|
#include "byte_array.h"
|
||||||
|
|
||||||
#include "common/utils/assertions.h"
|
#include "common/utils/assertions.h"
|
||||||
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
byte_array_t copy_byte_array(byte_array_t src)
|
byte_array_t copy_byte_array(byte_array_t src)
|
||||||
@@ -56,3 +57,19 @@ bool eq_byte_array(const byte_array_t* m0, const byte_array_t* m1)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
byte_array_t cp_str_to_ba(const char* str)
|
||||||
|
{
|
||||||
|
assert(str != NULL);
|
||||||
|
|
||||||
|
const size_t sz = strlen(str);
|
||||||
|
|
||||||
|
byte_array_t dst = {.len = sz};
|
||||||
|
|
||||||
|
dst.buf = calloc(sz,sizeof(uint8_t));
|
||||||
|
assert(dst.buf != NULL && "Memory exhausted");
|
||||||
|
|
||||||
|
memcpy(dst.buf, str, sz);
|
||||||
|
|
||||||
|
return dst;
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,8 +19,10 @@
|
|||||||
* contact@openairinterface.org
|
* contact@openairinterface.org
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef BYTE_ARRAY_H_OAI
|
#ifndef BYTE_ARRAY_H
|
||||||
#define BYTE_ARRAY_H_OAI
|
#define BYTE_ARRAY_H
|
||||||
|
|
||||||
|
/* WARNING: This file is also defined at XXXXX. Both files need to be completely equal. Same applies for *.c */
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
@@ -39,4 +41,6 @@ byte_array_t copy_byte_array(byte_array_t src);
|
|||||||
void free_byte_array(byte_array_t ba);
|
void free_byte_array(byte_array_t ba);
|
||||||
bool eq_byte_array(const byte_array_t* m0, const byte_array_t* m1);
|
bool eq_byte_array(const byte_array_t* m0, const byte_array_t* m1);
|
||||||
|
|
||||||
|
byte_array_t cp_str_to_ba(const char* str);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -709,7 +709,7 @@ int main( int argc, char **argv ) {
|
|||||||
const int mcc = rrc->configuration.mcc[0];
|
const int mcc = rrc->configuration.mcc[0];
|
||||||
const int mnc = rrc->configuration.mnc[0];
|
const int mnc = rrc->configuration.mnc[0];
|
||||||
const int mnc_digit_len = rrc->configuration.mnc_digit_length[0];
|
const int mnc_digit_len = rrc->configuration.mnc_digit_length[0];
|
||||||
const ngran_node_t node_type = rrc->node_type;
|
// const ngran_node_t node_type = rrc->node_type;
|
||||||
int nb_id = 0;
|
int nb_id = 0;
|
||||||
int cu_du_id = 0;
|
int cu_du_id = 0;
|
||||||
if (node_type == ngran_gNB) {
|
if (node_type == ngran_gNB) {
|
||||||
|
|||||||
Reference in New Issue
Block a user