osaf/libs/agents/saf/amfa/include/ava.h | 8 ++++----
osaf/libs/common/amfsv/Makefile.am | 14 +++++++-------
osaf/libs/common/amfsv/avsv_d2nedu.c | 8 ++++----
osaf/libs/common/amfsv/avsv_d2nmsg.c | 4 ++--
osaf/libs/common/amfsv/avsv_eduutil.c | 6 +++---
osaf/libs/common/amfsv/include/Makefile.am | 22 +++++++++++-----------
osaf/libs/common/amfsv/include/avsv.h | 6 +++---
osaf/libs/common/amfsv/include/avsv_amfparam.h | 0
osaf/libs/common/amfsv/include/avsv_d2nedu.h | 0
osaf/libs/common/amfsv/include/avsv_d2nmsg.h | 2 +-
osaf/libs/common/amfsv/include/avsv_defs.h | 0
osaf/libs/common/amfsv/include/avsv_eduutil.h | 0
osaf/libs/common/amfsv/include/avsv_ipc.h | 0
osaf/libs/common/amfsv/include/avsv_n2avaedu.h | 0
osaf/libs/common/amfsv/include/avsv_n2avamsg.h | 0
osaf/libs/common/amfsv/include/avsv_nd2ndmsg.h | 2 +-
osaf/libs/common/amfsv/include/avsv_util.h | 2 +-
osaf/libs/common/amfsv/avsv_n2avaedu.c | 10 +++++-----
osaf/libs/common/amfsv/avsv_n2avamsg.c | 8 ++++----
osaf/libs/common/amfsv/avsv_nd2ndedu.c | 14 +++++++-------
osaf/libs/common/amfsv/avsv_util.c | 2 +-
osaf/services/saf/amfsv/amfd/avd_ckpt_edu.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_comp.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_compcstype.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_comptype.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_csi.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_csiattr.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_hlt.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_imm.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_siass.cc | 2 +-
osaf/services/saf/amfsv/amfd/avd_sirankedsu.cc | 2 +-
osaf/services/saf/amfsv/amfd/include/avd.h | 8 ++++----
osaf/services/saf/amfsv/amfd/include/avd_comp.h | 2 +-
osaf/services/saf/amfsv/amfd/include/avd_evt.h | 2 +-
osaf/services/saf/amfsv/amfd/include/avd_msg.h | 2 +-
osaf/services/saf/amfsv/amfd/include/avd_node.h | 2 +-
osaf/services/saf/amfsv/amfd/include/avd_sg.h | 4 ++--
osaf/services/saf/amfsv/amfd/include/avd_si.h | 2 +-
osaf/services/saf/amfsv/amfd/include/avd_su.h | 2 +-
osaf/services/saf/amfsv/amfd/include/avd_util.h | 4 ++--
osaf/services/saf/amfsv/amfnd/avnd.c | 6 +++---
osaf/services/saf/amfsv/amfnd/avnd_ckpt_edu.c | 6 +++---
osaf/services/saf/amfsv/amfnd/avnd_compdb.c | 2 +-
osaf/services/saf/amfsv/amfnd/avnd_mds.c | 4 ++--
osaf/services/saf/amfsv/amfnd/include/avnd.h | 12 ++++++------
45 files changed, 93 insertions(+), 93 deletions(-)
diff --git a/osaf/libs/agents/saf/amfa/include/ava.h
b/osaf/libs/agents/saf/amfa/include/ava.h
--- a/osaf/libs/agents/saf/amfa/include/ava.h
+++ b/osaf/libs/agents/saf/amfa/include/ava.h
@@ -31,14 +31,14 @@
#define AVA_H
#include <ncs_main_papi.h>
#include <ncsencdec_pub.h>
-#include "avsv.h"
+#include "amfsv.h"
#include "ava_dl_api.h"
/* Porting Include Files */
#include "ava_def.h"
-#include "avsv_amfparam.h"
-#include "avsv_n2avamsg.h"
-#include "avsv_n2avaedu.h"
+#include "amfsv_amfparam.h"
+#include "amfsv_n2avamsg.h"
+#include "amfsv_n2avaedu.h"
#include "ava_hdl.h"
#include "ava_mds.h"
diff --git a/osaf/libs/common/amfsv/Makefile.am
b/osaf/libs/common/amfsv/Makefile.am
--- a/osaf/libs/common/amfsv/Makefile.am
+++ b/osaf/libs/common/amfsv/Makefile.am
@@ -27,10 +27,10 @@ libamfsv_common_la_CPPFLAGS = \
-I$(top_srcdir)/osaf/libs/common/amfsv/include
libamfsv_common_la_SOURCES = \
- avsv_d2nedu.c \
- avsv_nd2ndedu.c \
- avsv_d2nmsg.c \
- avsv_n2avamsg.c \
- avsv_n2avaedu.c \
- avsv_util.c \
- avsv_eduutil.c
+ d2nedu.c \
+ nd2ndedu.c \
+ d2nmsg.c \
+ n2avamsg.c \
+ n2avaedu.c \
+ util.c \
+ eduutil.c
diff --git a/osaf/libs/common/amfsv/avsv_d2nedu.c
b/osaf/libs/common/amfsv/d2nedu.c
rename from osaf/libs/common/amfsv/avsv_d2nedu.c
rename to osaf/libs/common/amfsv/d2nedu.c
--- a/osaf/libs/common/amfsv/avsv_d2nedu.c
+++ b/osaf/libs/common/amfsv/d2nedu.c
@@ -32,12 +32,12 @@
******************************************************************************
*/
-#include "avsv.h"
-#include "avsv_d2nmsg.h"
+#include "amfsv.h"
+#include "amfsv_d2nmsg.h"
/* AVD-AVND common EDPs */
-#include "avsv_d2nedu.h"
-#include "avsv_eduutil.h"
+#include "amfsv_d2nedu.h"
+#include "amfsv_eduutil.h"
/*****************************************************************************
diff --git a/osaf/libs/common/amfsv/avsv_d2nmsg.c
b/osaf/libs/common/amfsv/d2nmsg.c
rename from osaf/libs/common/amfsv/avsv_d2nmsg.c
rename to osaf/libs/common/amfsv/d2nmsg.c
--- a/osaf/libs/common/amfsv/avsv_d2nmsg.c
+++ b/osaf/libs/common/amfsv/d2nmsg.c
@@ -23,8 +23,8 @@
******************************************************************************
*/
-#include "avsv.h"
-#include "avsv_d2nmsg.h"
+#include "amfsv.h"
+#include "amfsv_d2nmsg.h"
/*****************************************************************************
* Function: free_d2n_su_msg_info
diff --git a/osaf/libs/common/amfsv/avsv_eduutil.c
b/osaf/libs/common/amfsv/eduutil.c
rename from osaf/libs/common/amfsv/avsv_eduutil.c
rename to osaf/libs/common/amfsv/eduutil.c
--- a/osaf/libs/common/amfsv/avsv_eduutil.c
+++ b/osaf/libs/common/amfsv/eduutil.c
@@ -34,10 +34,10 @@
******************************************************************************
*/
-#include "avsv.h"
+#include "amfsv.h"
#include "ncs_saf_edu.h"
-#include "avsv_eduutil.h"
-#include "avsv_d2nmsg.h"
+#include "amfsv_eduutil.h"
+#include "amfsv_d2nmsg.h"
/*****************************************************************************
diff --git a/osaf/libs/common/amfsv/include/Makefile.am
b/osaf/libs/common/amfsv/include/Makefile.am
--- a/osaf/libs/common/amfsv/include/Makefile.am
+++ b/osaf/libs/common/amfsv/include/Makefile.am
@@ -19,14 +19,14 @@ include $(top_srcdir)/Makefile.common
MAINTAINERCLEANFILES = Makefile.in
noinst_HEADERS = \
- avsv_amfparam.h \
- avsv_d2nedu.h \
- avsv_d2nmsg.h \
- avsv_defs.h \
- avsv_eduutil.h \
- avsv.h \
- avsv_ipc.h \
- avsv_n2avaedu.h \
- avsv_n2avamsg.h \
- avsv_util.h \
- avsv_nd2ndmsg.h
+ amfsv_amfparam.h \
+ amfsv_d2nedu.h \
+ amfsv_d2nmsg.h \
+ amfsv_defs.h \
+ amfsv_eduutil.h \
+ amfsv.h \
+ amfsv_ipc.h \
+ amfsv_n2avaedu.h \
+ amfsv_n2avamsg.h \
+ amfsv_util.h \
+ amfsv_nd2ndmsg.h
diff --git a/osaf/libs/common/amfsv/include/avsv.h
b/osaf/libs/common/amfsv/include/amfsv.h
rename from osaf/libs/common/amfsv/include/avsv.h
rename to osaf/libs/common/amfsv/include/amfsv.h
--- a/osaf/libs/common/amfsv/include/avsv.h
+++ b/osaf/libs/common/amfsv/include/amfsv.h
@@ -40,10 +40,10 @@
#include "mds_papi.h"
#include "ncs_mda_pvt.h"
#include "ncs_edu_pub.h"
-#include "avsv_defs.h"
-#include "avsv_util.h"
+#include "amfsv_defs.h"
+#include "amfsv_util.h"
#include "ncs_util.h"
-#include "avsv_eduutil.h"
+#include "amfsv_eduutil.h"
#include "ncssysf_lck.h"
#include "ncs_hdl_pub.h"
#include "ncs_main_papi.h"
diff --git a/osaf/libs/common/amfsv/include/avsv_amfparam.h
b/osaf/libs/common/amfsv/include/amfsv_amfparam.h
rename from osaf/libs/common/amfsv/include/avsv_amfparam.h
rename to osaf/libs/common/amfsv/include/amfsv_amfparam.h
diff --git a/osaf/libs/common/amfsv/include/avsv_d2nedu.h
b/osaf/libs/common/amfsv/include/amfsv_d2nedu.h
rename from osaf/libs/common/amfsv/include/avsv_d2nedu.h
rename to osaf/libs/common/amfsv/include/amfsv_d2nedu.h
diff --git a/osaf/libs/common/amfsv/include/avsv_d2nmsg.h
b/osaf/libs/common/amfsv/include/amfsv_d2nmsg.h
rename from osaf/libs/common/amfsv/include/avsv_d2nmsg.h
rename to osaf/libs/common/amfsv/include/amfsv_d2nmsg.h
--- a/osaf/libs/common/amfsv/include/avsv_d2nmsg.h
+++ b/osaf/libs/common/amfsv/include/amfsv_d2nmsg.h
@@ -36,7 +36,7 @@
#include <saClm.h>
#include <mds_papi.h>
-#include <avsv_defs.h>
+#include <amfsv_defs.h>
#include <stdbool.h>
#ifdef __cplusplus
diff --git a/osaf/libs/common/amfsv/include/avsv_defs.h
b/osaf/libs/common/amfsv/include/amfsv_defs.h
rename from osaf/libs/common/amfsv/include/avsv_defs.h
rename to osaf/libs/common/amfsv/include/amfsv_defs.h
diff --git a/osaf/libs/common/amfsv/include/avsv_eduutil.h
b/osaf/libs/common/amfsv/include/amfsv_eduutil.h
rename from osaf/libs/common/amfsv/include/avsv_eduutil.h
rename to osaf/libs/common/amfsv/include/amfsv_eduutil.h
diff --git a/osaf/libs/common/amfsv/include/avsv_ipc.h
b/osaf/libs/common/amfsv/include/amfsv_ipc.h
rename from osaf/libs/common/amfsv/include/avsv_ipc.h
rename to osaf/libs/common/amfsv/include/amfsv_ipc.h
diff --git a/osaf/libs/common/amfsv/include/avsv_n2avaedu.h
b/osaf/libs/common/amfsv/include/amfsv_n2avaedu.h
rename from osaf/libs/common/amfsv/include/avsv_n2avaedu.h
rename to osaf/libs/common/amfsv/include/amfsv_n2avaedu.h
diff --git a/osaf/libs/common/amfsv/include/avsv_n2avamsg.h
b/osaf/libs/common/amfsv/include/amfsv_n2avamsg.h
rename from osaf/libs/common/amfsv/include/avsv_n2avamsg.h
rename to osaf/libs/common/amfsv/include/amfsv_n2avamsg.h
diff --git a/osaf/libs/common/amfsv/include/avsv_nd2ndmsg.h
b/osaf/libs/common/amfsv/include/amfsv_nd2ndmsg.h
rename from osaf/libs/common/amfsv/include/avsv_nd2ndmsg.h
rename to osaf/libs/common/amfsv/include/amfsv_nd2ndmsg.h
--- a/osaf/libs/common/amfsv/include/avsv_nd2ndmsg.h
+++ b/osaf/libs/common/amfsv/include/amfsv_nd2ndmsg.h
@@ -35,7 +35,7 @@
#ifndef AVSV_ND2NDMSG_H
#define AVSV_ND2NDMSG_H
-#include<avsv_n2avamsg.h>
+#include <amfsv_n2avamsg.h>
/* Message format versions */
#define AVSV_AVND_AVND_MSG_FMT_VER_1 1
diff --git a/osaf/libs/common/amfsv/include/avsv_util.h
b/osaf/libs/common/amfsv/include/amfsv_util.h
rename from osaf/libs/common/amfsv/include/avsv_util.h
rename to osaf/libs/common/amfsv/include/amfsv_util.h
--- a/osaf/libs/common/amfsv/include/avsv_util.h
+++ b/osaf/libs/common/amfsv/include/amfsv_util.h
@@ -32,7 +32,7 @@
#include <saAmf.h>
#include <ncsgl_defs.h>
-#include <avsv_defs.h>
+#include <amfsv_defs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/osaf/libs/common/amfsv/avsv_n2avaedu.c
b/osaf/libs/common/amfsv/n2avaedu.c
rename from osaf/libs/common/amfsv/avsv_n2avaedu.c
rename to osaf/libs/common/amfsv/n2avaedu.c
--- a/osaf/libs/common/amfsv/avsv_n2avaedu.c
+++ b/osaf/libs/common/amfsv/n2avaedu.c
@@ -39,11 +39,11 @@
******************************************************************************
*/
-#include "avsv.h"
-#include "avsv_amfparam.h"
-#include "avsv_n2avamsg.h"
-#include "avsv_n2avaedu.h"
-#include "avsv_eduutil.h"
+#include "amfsv.h"
+#include "amfsv_amfparam.h"
+#include "amfsv_n2avamsg.h"
+#include "amfsv_n2avaedu.h"
+#include "amfsv_eduutil.h"
static uint32_t avsv_edp_api_resp_info(EDU_HDL *hdl, EDU_TKN *edu_tkn,
NCSCONTEXT ptr, uint32_t *ptr_data_len,
diff --git a/osaf/libs/common/amfsv/avsv_n2avamsg.c
b/osaf/libs/common/amfsv/n2avamsg.c
rename from osaf/libs/common/amfsv/avsv_n2avamsg.c
rename to osaf/libs/common/amfsv/n2avamsg.c
--- a/osaf/libs/common/amfsv/avsv_n2avamsg.c
+++ b/osaf/libs/common/amfsv/n2avamsg.c
@@ -32,10 +32,10 @@
******************************************************************************
*/
-#include "avsv.h"
-#include "avsv_amfparam.h"
-#include "avsv_n2avamsg.h"
-#include "avsv_nd2ndmsg.h"
+#include "amfsv.h"
+#include "amfsv_amfparam.h"
+#include "amfsv_n2avamsg.h"
+#include "amfsv_nd2ndmsg.h"
/****************************************************************************
Name : avsv_nda_ava_msg_free
diff --git a/osaf/libs/common/amfsv/avsv_nd2ndedu.c
b/osaf/libs/common/amfsv/nd2ndedu.c
rename from osaf/libs/common/amfsv/avsv_nd2ndedu.c
rename to osaf/libs/common/amfsv/nd2ndedu.c
--- a/osaf/libs/common/amfsv/avsv_nd2ndedu.c
+++ b/osaf/libs/common/amfsv/nd2ndedu.c
@@ -32,15 +32,15 @@
******************************************************************************
*/
-#include "avsv.h"
-#include "avsv_amfparam.h"
-#include "avsv_d2nmsg.h"
+#include "amfsv.h"
+#include "amfsv_amfparam.h"
+#include "amfsv_d2nmsg.h"
/* AVD-AVND common EDPs */
-#include "avsv_d2nedu.h"
-#include "avsv_eduutil.h"
-#include "avsv_n2avaedu.h"
-#include "avsv_nd2ndmsg.h"
+#include "amfsv_d2nedu.h"
+#include "amfsv_eduutil.h"
+#include "amfsv_n2avaedu.h"
+#include "amfsv_nd2ndmsg.h"
int avsv_nd_nd_test_type_fnc(NCSCONTEXT arg);
diff --git a/osaf/libs/common/amfsv/avsv_util.c b/osaf/libs/common/amfsv/util.c
rename from osaf/libs/common/amfsv/avsv_util.c
rename to osaf/libs/common/amfsv/util.c
--- a/osaf/libs/common/amfsv/avsv_util.c
+++ b/osaf/libs/common/amfsv/util.c
@@ -31,7 +31,7 @@
******************************************************************************
*/
-#include "avsv.h"
+#include "amfsv.h"
/*****************************************************************************
* Function: avsv_cpy_SU_DN_from_DN
diff --git a/osaf/services/saf/amfsv/amfd/avd_ckpt_edu.cc
b/osaf/services/saf/amfsv/amfd/avd_ckpt_edu.cc
--- a/osaf/services/saf/amfsv/amfd/avd_ckpt_edu.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_ckpt_edu.cc
@@ -33,7 +33,7 @@
*/
#include <avd.h>
-#include <avsv.h>
+#include <amfsv.h>
#include <avd_cluster.h>
/*****************************************************************************
diff --git a/osaf/services/saf/amfsv/amfd/avd_comp.cc
b/osaf/services/saf/amfsv/amfd/avd_comp.cc
--- a/osaf/services/saf/amfsv/amfd/avd_comp.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_comp.cc
@@ -31,7 +31,7 @@
#include <saImmOm.h>
#include <immutil.h>
#include <logtrace.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <avd_util.h>
#include <avd_comp.h>
#include <avd_imm.h>
diff --git a/osaf/services/saf/amfsv/amfd/avd_compcstype.cc
b/osaf/services/saf/amfsv/amfd/avd_compcstype.cc
--- a/osaf/services/saf/amfsv/amfd/avd_compcstype.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_compcstype.cc
@@ -20,7 +20,7 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <avd_util.h>
#include <avd_comp.h>
#include <avd_imm.h>
diff --git a/osaf/services/saf/amfsv/amfd/avd_comptype.cc
b/osaf/services/saf/amfsv/amfd/avd_comptype.cc
--- a/osaf/services/saf/amfsv/amfd/avd_comptype.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_comptype.cc
@@ -20,7 +20,7 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <avd_comp.h>
#include <avd_imm.h>
diff --git a/osaf/services/saf/amfsv/amfd/avd_csi.cc
b/osaf/services/saf/amfsv/amfd/avd_csi.cc
--- a/osaf/services/saf/amfsv/amfd/avd_csi.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_csi.cc
@@ -19,7 +19,7 @@
#include <logtrace.h>
#include <avd_util.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <avd_csi.h>
#include <avd_imm.h>
#include <avd_proc.h>
diff --git a/osaf/services/saf/amfsv/amfd/avd_csiattr.cc
b/osaf/services/saf/amfsv/amfd/avd_csiattr.cc
--- a/osaf/services/saf/amfsv/amfd/avd_csiattr.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_csiattr.cc
@@ -19,7 +19,7 @@
#include <stdbool.h>
#include <logtrace.h>
#include <avd_util.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <avd_csi.h>
#include <avd_imm.h>
diff --git a/osaf/services/saf/amfsv/amfd/avd_hlt.cc
b/osaf/services/saf/amfsv/amfd/avd_hlt.cc
--- a/osaf/services/saf/amfsv/amfd/avd_hlt.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_hlt.cc
@@ -21,7 +21,7 @@
#include <logtrace.h>
#include <immutil.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <avd_imm.h>
#include <avd_hlt.h>
#include <avd_comp.h>
diff --git a/osaf/services/saf/amfsv/amfd/avd_imm.cc
b/osaf/services/saf/amfsv/amfd/avd_imm.cc
--- a/osaf/services/saf/amfsv/amfd/avd_imm.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_imm.cc
@@ -35,7 +35,7 @@
#include <avd_evt.h>
#include <avd_util.h>
#include <avd_cb.h>
-#include <avsv_defs.h>
+#include <amfsv_defs.h>
#include <avd_imm.h>
#include <avd_cluster.h>
#include <avd_app.h>
diff --git a/osaf/services/saf/amfsv/amfd/avd_siass.cc
b/osaf/services/saf/amfsv/amfd/avd_siass.cc
--- a/osaf/services/saf/amfsv/amfd/avd_siass.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_siass.cc
@@ -31,7 +31,7 @@
#include <logtrace.h>
#include <saflog.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <avd_util.h>
#include <avd_susi.h>
#include <avd_imm.h>
diff --git a/osaf/services/saf/amfsv/amfd/avd_sirankedsu.cc
b/osaf/services/saf/amfsv/amfd/avd_sirankedsu.cc
--- a/osaf/services/saf/amfsv/amfd/avd_sirankedsu.cc
+++ b/osaf/services/saf/amfsv/amfd/avd_sirankedsu.cc
@@ -27,7 +27,7 @@
* Module Inclusion Control...
*/
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <avd_util.h>
#include <avd_susi.h>
#include <immutil.h>
diff --git a/osaf/services/saf/amfsv/amfd/include/avd.h
b/osaf/services/saf/amfsv/amfd/include/avd.h
--- a/osaf/services/saf/amfsv/amfd/include/avd.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd.h
@@ -34,18 +34,18 @@
#define AVD_H
#include "logtrace.h"
-#include "avsv.h"
+#include "amfsv.h"
#include "logtrace.h"
#include "ncsencdec_pub.h"
-#include "avsv_d2nmsg.h"
+#include "amfsv_d2nmsg.h"
/* Porting Include Files */
#include "avd_def.h"
-#include "avsv_ipc.h"
+#include "amfsv_ipc.h"
/* AVD-AVND common EDPs */
-#include "avsv_d2nedu.h"
+#include "amfsv_d2nedu.h"
#include "mbcsv_papi.h"
#include "avd_ckp.h"
diff --git a/osaf/services/saf/amfsv/amfd/include/avd_comp.h
b/osaf/services/saf/amfsv/amfd/include/avd_comp.h
--- a/osaf/services/saf/amfsv/amfd/include/avd_comp.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd_comp.h
@@ -37,7 +37,7 @@
#include <saAmf.h>
#include <saImm.h>
#include <ncspatricia.h>
-#include <avsv_d2nmsg.h>
+#include <amfsv_d2nmsg.h>
#include <avd_su.h>
/* AMF Class SaAmfCompGlobalAttributes */
diff --git a/osaf/services/saf/amfsv/amfd/include/avd_evt.h
b/osaf/services/saf/amfsv/amfd/include/avd_evt.h
--- a/osaf/services/saf/amfsv/amfd/include/avd_evt.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd_evt.h
@@ -34,7 +34,7 @@
#ifndef AVD_EVT_H
#define AVD_EVT_H
-#include <avsv_ipc.h>
+#include <amfsv_ipc.h>
#include <avd_util.h>
/* event type enums */
diff --git a/osaf/services/saf/amfsv/amfd/include/avd_msg.h
b/osaf/services/saf/amfsv/amfd/include/avd_msg.h
--- a/osaf/services/saf/amfsv/amfd/include/avd_msg.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd_msg.h
@@ -34,7 +34,7 @@
#ifndef AVD_MSG_H
#define AVD_MSG_H
-#include <avsv_d2nmsg.h>
+#include <amfsv_d2nmsg.h>
typedef enum {
AVD_D2D_CHANGE_ROLE_REQ = AVSV_DND_MSG_MAX,
diff --git a/osaf/services/saf/amfsv/amfd/include/avd_node.h
b/osaf/services/saf/amfsv/amfd/include/avd_node.h
--- a/osaf/services/saf/amfsv/amfd/include/avd_node.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd_node.h
@@ -41,7 +41,7 @@
#include <ncsdlib.h>
#include <mds_papi.h>
#include <avd_su.h>
-#include <avsv_d2nmsg.h>
+#include <amfsv_d2nmsg.h>
#include <avd_tmr.h>
struct avd_cluster_tag;
diff --git a/osaf/services/saf/amfsv/amfd/include/avd_sg.h
b/osaf/services/saf/amfsv/amfd/include/avd_sg.h
--- a/osaf/services/saf/amfsv/amfd/include/avd_sg.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd_sg.h
@@ -38,8 +38,8 @@
#include <ncspatricia.h>
#include <avd_su.h>
#include <avd_si.h>
-#include <avsv_defs.h>
-#include <avsv_d2nmsg.h>
+#include <amfsv_defs.h>
+#include <amfsv_d2nmsg.h>
/* The valid SG FSM states. */
typedef enum {
diff --git a/osaf/services/saf/amfsv/amfd/include/avd_si.h
b/osaf/services/saf/amfsv/amfd/include/avd_si.h
--- a/osaf/services/saf/amfsv/amfd/include/avd_si.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd_si.h
@@ -41,7 +41,7 @@
#include <avd_sg.h>
#include <avd_su.h>
#include <avd_sg.h>
-#include <avsv_defs.h>
+#include <amfsv_defs.h>
#include <avd_ckpt_msg.h>
/* Enum values defines different SI-SI dependency FSM states. */
diff --git a/osaf/services/saf/amfsv/amfd/include/avd_su.h
b/osaf/services/saf/amfsv/amfd/include/avd_su.h
--- a/osaf/services/saf/amfsv/amfd/include/avd_su.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd_su.h
@@ -40,7 +40,7 @@
#include <avd_cb.h>
#include <avd_node.h>
#include <avd_sg.h>
-#include <avsv_defs.h>
+#include <amfsv_defs.h>
#include <avd_msg.h>
#include <avd_comp.h>
diff --git a/osaf/services/saf/amfsv/amfd/include/avd_util.h
b/osaf/services/saf/amfsv/amfd/include/avd_util.h
--- a/osaf/services/saf/amfsv/amfd/include/avd_util.h
+++ b/osaf/services/saf/amfsv/amfd/include/avd_util.h
@@ -35,10 +35,10 @@
#define AVD_MSG_H
#include <stdbool.h>
-#include <avsv_d2nmsg.h>
+#include <amfsv_d2nmsg.h>
#include <avd_cb.h>
#include <stdbool.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
typedef enum {
AVD_D2D_CHANGE_ROLE_REQ = AVSV_DND_MSG_MAX,
diff --git a/osaf/services/saf/amfsv/amfnd/avnd.c
b/osaf/services/saf/amfsv/amfnd/avnd.c
--- a/osaf/services/saf/amfsv/amfnd/avnd.c
+++ b/osaf/services/saf/amfsv/amfnd/avnd.c
@@ -38,9 +38,9 @@
#include <logtrace.h>
#include "avnd.h"
-#include "avsv_d2nedu.h"
-#include "avsv_n2avaedu.h"
-#include "avsv_nd2ndmsg.h"
+#include "amfsv_d2nedu.h"
+#include "amfsv_n2avaedu.h"
+#include "amfsv_nd2ndmsg.h"
#include "avnd_mon.h"
/* global task handle */
diff --git a/osaf/services/saf/amfsv/amfnd/avnd_ckpt_edu.c
b/osaf/services/saf/amfsv/amfnd/avnd_ckpt_edu.c
--- a/osaf/services/saf/amfsv/amfnd/avnd_ckpt_edu.c
+++ b/osaf/services/saf/amfsv/amfnd/avnd_ckpt_edu.c
@@ -33,11 +33,11 @@
*/
#include "avnd.h"
-#include "avsv.h"
+#include "amfsv.h"
#include "ncs_saf_edu.h"
#include "avnd_ckpt_edu.h"
-#include "avsv_d2nedu.h"
-#include "avsv_n2avaedu.h"
+#include "amfsv_d2nedu.h"
+#include "amfsv_n2avaedu.h"
/*****************************************************************************
diff --git a/osaf/services/saf/amfsv/amfnd/avnd_compdb.c
b/osaf/services/saf/amfsv/amfnd/avnd_compdb.c
--- a/osaf/services/saf/amfsv/amfnd/avnd_compdb.c
+++ b/osaf/services/saf/amfsv/amfnd/avnd_compdb.c
@@ -34,7 +34,7 @@
#include <stdbool.h>
#include <saImmOm.h>
-#include <avsv_util.h>
+#include <amfsv_util.h>
#include <immutil.h>
#include <logtrace.h>
diff --git a/osaf/services/saf/amfsv/amfnd/avnd_mds.c
b/osaf/services/saf/amfsv/amfnd/avnd_mds.c
--- a/osaf/services/saf/amfsv/amfnd/avnd_mds.c
+++ b/osaf/services/saf/amfsv/amfnd/avnd_mds.c
@@ -33,8 +33,8 @@
#include <logtrace.h>
#include "avnd.h"
-#include "avsv_d2nedu.h"
-#include "avsv_n2avaedu.h"
+#include "amfsv_d2nedu.h"
+#include "amfsv_n2avaedu.h"
#include "ncsencdec_pub.h"
const MDS_CLIENT_MSG_FORMAT_VER
avnd_avd_msg_fmt_map_table[AVND_AVD_SUBPART_VER_MAX] =
diff --git a/osaf/services/saf/amfsv/amfnd/include/avnd.h
b/osaf/services/saf/amfsv/amfnd/include/avnd.h
--- a/osaf/services/saf/amfsv/amfnd/include/avnd.h
+++ b/osaf/services/saf/amfsv/amfnd/include/avnd.h
@@ -35,7 +35,7 @@
#include <saImmOm.h>
-#include "avsv.h"
+#include "amfsv.h"
#include "ncs_main_papi.h"
#include "ncssysf_def.h"
#include "ncssysf_tsk.h"
@@ -44,13 +44,13 @@
/* Porting Include Files */
#include "avnd_defs.h"
-#include "avsv_ipc.h"
+#include "amfsv_ipc.h"
/* AvSv Common Files */
-#include "avsv_amfparam.h"
-#include "avsv_d2nmsg.h"
-#include "avsv_n2avamsg.h"
-#include "avsv_nd2ndmsg.h"
+#include "amfsv_amfparam.h"
+#include "amfsv_d2nmsg.h"
+#include "amfsv_n2avamsg.h"
+#include "amfsv_nd2ndmsg.h"
/* AvND Files */
#include "mbcsv_papi.h"
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
