osaf/libs/core/leap/include/Makefile.am | 1 -
osaf/libs/core/leap/include/sysf_pat.h | 71
-----------------------------------
osaf/libs/core/leap/patricia.c | 5 +-
3 files changed, 2 insertions(+), 75 deletions(-)
diff --git a/osaf/libs/core/leap/include/Makefile.am
b/osaf/libs/core/leap/include/Makefile.am
--- a/osaf/libs/core/leap/include/Makefile.am
+++ b/osaf/libs/core/leap/include/Makefile.am
@@ -27,5 +27,4 @@ noinst_HEADERS = \
sysf_def.h \
sysf_exc_scr.h \
sysf_ipc.h \
- sysf_pat.h \
usrbuf.h
diff --git a/osaf/libs/core/leap/include/sysf_pat.h
b/osaf/libs/core/leap/include/sysf_pat.h
deleted file mode 100644
--- a/osaf/libs/core/leap/include/sysf_pat.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- OpenSAF -*-
- *
- * (C) Copyright 2008 The OpenSAF Foundation
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
- * under the GNU Lesser General Public License Version 2.1, February 1999.
- * The complete license can be accessed from the following location:
- * http://opensource.org/licenses/lgpl-license.php
- * See the Copying file included with the OpenSAF distribution for full
- * licensing terms.
- *
- * Author(s): Emerson Network Power
- *
- */
-
-/*****************************************************************************
-..............................................................................
-
-..............................................................................
-
- DESCRIPTION:
-
- This module contains declarations related to target system Memory Mgmt
- services specifically used by the H&J patricia tree library
-
-..............................................................................
-*/
-
-/*
- * Module Inclusion Control...
- */
-#ifndef _SYSF_PAT_H_
-#define _SYSF_PAT_H_
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- @
- @ MEMORY MANAGER PRIMITIVES (MACROS)...
- @ Populate accordingly during portation.
- @
- @
- @ The following macros provide the front-end to the target system memory
- @ manager. These macros must be changed such that the desired operation is
- @ accomplished by using the target system memory manager primitives.
- @
- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-/**
- ** NOTES:
- ** The arguments used by the m_MMGR_* macros defined below are as follows:
- ** p - a pointer
- **/
-
-/** Target defined macros for conventional release and allocation of
- ** data structures, link-lists, etc.
- **/
-#define m_MMGR_ALLOC_PATRICIA_STACK(size) \
- (NCS_PATRICIA_LEXICAL_STACK *)m_NCS_MEM_ALLOC(size,
NCS_MEM_REGION_PERSISTENT, \
- NCS_SERVICE_ID_COMMON, 1)
-#define m_MMGR_FREE_PATRICIA_STACK(p) \
- m_NCS_MEM_FREE(p, NCS_MEM_REGION_PERSISTENT, \
- NCS_SERVICE_ID_COMMON, 1)
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- @
- @ FUNCTION PROTOTYPES
- @
- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-#endif
diff --git a/osaf/libs/core/leap/patricia.c b/osaf/libs/core/leap/patricia.c
--- a/osaf/libs/core/leap/patricia.c
+++ b/osaf/libs/core/leap/patricia.c
@@ -44,7 +44,6 @@
#include "ncssysfpool.h"
#include "ncssysf_def.h"
#include "patricia.h"
-#include "sysf_pat.h"
const static uint8_t BitMasks[9] = {
0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff
@@ -158,7 +157,7 @@ unsigned int ncs_patricia_tree_init(NCS_
pTree->root_node.key_info = (uint8_t *)0;
pTree->root_node.bit = -1;
pTree->root_node.left = pTree->root_node.right = &pTree->root_node;
- if ((pTree->root_node.key_info =
m_MMGR_ALLOC_PATRICIA_STACK(pTree->params.key_size)) == NULL) {
+ if ((pTree->root_node.key_info = (NCS_PATRICIA_LEXICAL_STACK
*)malloc(pTree->params.key_size)) == NULL) {
return (unsigned int)m_LEAP_DBG_SINK(NCSCC_RC_FAILURE);
}
@@ -192,7 +191,7 @@ unsigned int ncs_patricia_tree_init(NCS_
unsigned int ncs_patricia_tree_destroy(NCS_PATRICIA_TREE *const pTree)
{
ncs_patricia_tree_clear(pTree);
- m_MMGR_FREE_PATRICIA_STACK(pTree->root_node.key_info);
+ free(pTree->root_node.key_info);
return NCSCC_RC_SUCCESS;
}
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
