From 2fcc6333b3b70a89b1ae218ae7b51d65dd3105aa Mon Sep 17 00:00:00 2001
From: frtabu <francois.taburet@nokia-bell-labs.com>
Date: Tue, 12 Feb 2019 10:32:57 +0100
Subject: [PATCH] Fix compil warnings after rebase
---
common/config/config_cmdline.c | 2 +-
openair2/LAYER2/MAC/eNB_scheduler_primitives.c | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/common/config/config_cmdline.c b/common/config/config_cmdline.c
index 1e5fb9e72b2..0083c2e66bf 100644
--- a/common/config/config_cmdline.c
+++ b/common/config/config_cmdline.c
@@ -173,7 +173,7 @@ int config_check_unknown_cmdlineopt(char *prefix) {
if (strcmp(prefix,CONFIG_CHECKALLSECTIONS) == 0)
finalcheck = 1;
else if (strlen(prefix) > 0) {
- sprintf(testprefix,"--%.*s.",CONFIG_MAXOPTLENGTH-1,prefix);
+ sprintf(testprefix,"--%.*s.",CONFIG_MAXOPTLENGTH-4,prefix);
}
}
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index 01749c688fb..e0d21f0f31d 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -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) {
eNB_MAC_INST *eNB = RC.mac[module_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;
-=======
- 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
AssertFatal(cc->p_eNB <= 2, "p_eNB is %d, should be <2\n",
--
GitLab