Skip to content

O
OpenXG-RAN
Commit 2fcc6333 authored by frtabu's avatar frtabu
Browse files
Options

Fix compil warnings after rebase

parent a50596af
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
common/config/config_cmdline.c
View file @ 2fcc6333
...@@ -173,7 +173,7 @@ int config_check_unknown_cmdlineopt(char *prefix) { ...@@ -173,7 +173,7 @@ int config_check_unknown_cmdlineopt(char *prefix) {
if (strcmp(prefix,CONFIG_CHECKALLSECTIONS) == 0) if (strcmp(prefix,CONFIG_CHECKALLSECTIONS) == 0)
finalcheck = 1; finalcheck = 1;
else if (strlen(prefix) > 0) { else if (strlen(prefix) > 0) {
sprintf(testprefix,"--%.*s.",CONFIG_MAXOPTLENGTH-1,prefix); sprintf(testprefix,"--%.*s.",CONFIG_MAXOPTLENGTH-4,prefix);
} }
} }
......
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @ 2fcc6333
...@@ -2321,13 +2321,8 @@ UE_is_to_be_scheduled(module_id_t module_idP, int CC_id, uint8_t UE_id) { ...@@ -2321,13 +2321,8 @@ UE_is_to_be_scheduled(module_id_t module_idP, int CC_id, uint8_t UE_id) {
uint8_t get_tmode(module_id_t module_idP, int CC_idP, int UE_idP) { uint8_t get_tmode(module_id_t module_idP, int CC_idP, int UE_idP) {
eNB_MAC_INST *eNB = RC.mac[module_idP]; eNB_MAC_INST *eNB = RC.mac[module_idP];
COMMON_channels_t *cc = &eNB->common_channels[CC_idP]; COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
<<<<<<< HEAD
struct LTE_PhysicalConfigDedicated *physicalConfigDedicated = eNB->UE_list.UE_template[CC_idP][UE_idP].physicalConfigDedicated; struct LTE_PhysicalConfigDedicated *physicalConfigDedicated = eNB->UE_list.UE_template[CC_idP][UE_idP].physicalConfigDedicated;
=======
LTE_PhysicalConfigDedicated_t *physicalConfigDedicated = eNB->UE_list.physicalConfigDedicated[CC_idP][UE_idP];
>>>>>>> new set of cppcheck fixes
if (physicalConfigDedicated == NULL) { // RRCConnectionSetup not received by UE yet if (physicalConfigDedicated == NULL) { // RRCConnectionSetup not received by UE yet
AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n", AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment