Re: [devel] [PATCH 3 of 3] IMMTOOLS: Add support of NO_DANGLING flag to IMM tools [#49]

2013-12-10 Thread Zoran Milinkovic 
Hi,

I will add saImmOm_A_2_13.h to the spec file.

Thanks,
Zoran

-Original Message-
From: Sirisha Alla [mailto:sirisha.a...@oracle.com] 
Sent: den 10 december 2013 08:13
To: opensaf-devel@lists.sourceforge.net
Subject: Re: [devel] [PATCH 3 of 3] IMMTOOLS: Add support of NO_DANGLING flag 
to IMM tools [#49]

Hi Zoran,

make rpm fails after applying this patch series. Entry needs to be added for 
saImmOm_A_2_13.h in opensaf.spec file.

Regards,
Sirisha

On 12/05/2013 08:34 PM, Zoran Milinkovic wrote:
   osaf/tools/safimm/immcfg/imm_import.cc |  2 ++
   osaf/tools/safimm/immdump/imm_xmlw_dump.cc |  9 +
   osaf/tools/safimm/immlist/imm_list.c   |  3 +++
   3 files changed, 14 insertions(+), 0 deletions(-)


 Support reference integrity (NO_DANGLING flag) to IMM tools

 diff --git a/osaf/tools/safimm/immcfg/imm_import.cc 
 b/osaf/tools/safimm/immcfg/imm_import.cc
 --- a/osaf/tools/safimm/immcfg/imm_import.cc
 +++ b/osaf/tools/safimm/immcfg/imm_import.cc
 @@ -1832,6 +1832,8 @@ static SaImmAttrFlagsT charsToFlagsHelpe
   return SA_IMM_ATTR_NOTIFY;
   } else if (len == strlen(SA_NO_DUPLICATES)  strncmp((const 
 char*)str, SA_NO_DUPLICATES, len) == 0) {
   return SA_IMM_ATTR_NO_DUPLICATES;
 + } else if (len == strlen(SA_NO_DANGLING)  strncmp((const char*)str, 
 SA_NO_DANGLING, len) == 0) {
 + return SA_IMM_ATTR_NO_DANGLING;
   }

   /* strlen(SA_NO_DUPLICATES) == 16 (the longest flag name) diff 
 --git a/osaf/tools/safimm/immdump/imm_xmlw_dump.cc 
 b/osaf/tools/safimm/immdump/imm_xmlw_dump.cc
 --- a/osaf/tools/safimm/immdump/imm_xmlw_dump.cc
 +++ b/osaf/tools/safimm/immdump/imm_xmlw_dump.cc
 @@ -508,6 +508,15 @@ void flagsToXMLw(SaImmAttrDefinitionT_2*
   }
   }

 +if (flags  SA_IMM_ATTR_NO_DANGLING)
 +{
 +if(xmlTextWriterWriteElement(writer, (xmlChar*) flag,
 +   (xmlChar*) SA_NO_DANGLING)  0 ) {
 +std::cout  Error at xmlTextWriterWriteElement (flag - 
 SA_NO_DANGLING)  std::endl;
 +exit(1);
 +}
 +}
 +
   }

   void typeToXMLw(SaImmAttrDefinitionT_2* p, xmlTextWriterPtr writer) 
 diff --git a/osaf/tools/safimm/immlist/imm_list.c 
 b/osaf/tools/safimm/immlist/imm_list.c
 --- a/osaf/tools/safimm/immlist/imm_list.c
 +++ b/osaf/tools/safimm/immlist/imm_list.c
 @@ -323,6 +323,9 @@ static void display_class_definition(con
   if (attrDefinition-attrFlags  
 SA_IMM_ATTR_NO_DUPLICATES)
   printf(, NO_DUPLICATES);

 + if (attrDefinition-attrFlags  SA_IMM_ATTR_NO_DANGLING)
 + printf(, NO_DANGLING);
 +
   } else if (attrDefinition-attrFlags  SA_IMM_ATTR_RUNTIME) {
   if (attrDefinition-attrDefaultValue != NULL) {
   printf( = );

 --
 
 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=111408631iu=/4140/ostg.
 clktrk ___
 Opensaf-devel mailing list
 Opensaf-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/opensaf-devel

--
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=111408631iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

--
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=111408631iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

[devel] [PATCH 3 of 3] IMMTOOLS: Add support of NO_DANGLING flag to IMM tools [#49]

2013-11-22 Thread Zoran Milinkovic 
 osaf/tools/safimm/immcfg/imm_import.cc |  2 ++
 osaf/tools/safimm/immdump/imm_xmlw_dump.cc |  9 +
 osaf/tools/safimm/immlist/imm_list.c   |  3 +++
 3 files changed, 14 insertions(+), 0 deletions(-)


Support reference integrity (NO_DANGLING flag) to IMM tools

diff --git a/osaf/tools/safimm/immcfg/imm_import.cc 
b/osaf/tools/safimm/immcfg/imm_import.cc
--- a/osaf/tools/safimm/immcfg/imm_import.cc
+++ b/osaf/tools/safimm/immcfg/imm_import.cc
@@ -1612,6 +1612,8 @@ static SaImmAttrFlagsT charsToFlagsHelpe
return SA_IMM_ATTR_NOTIFY;
} else if (len == strlen(SA_NO_DUPLICATES)  strncmp((const 
char*)str, SA_NO_DUPLICATES, len) == 0) {
return SA_IMM_ATTR_NO_DUPLICATES;
+   } else if (len == strlen(SA_NO_DANGLING)  strncmp((const char*)str, 
SA_NO_DANGLING, len) == 0) {
+   return SA_IMM_ATTR_NO_DANGLING;
}
 
LOG_ER(UNKNOWN FLAGS, %s, str);
diff --git a/osaf/tools/safimm/immdump/imm_xmlw_dump.cc 
b/osaf/tools/safimm/immdump/imm_xmlw_dump.cc
--- a/osaf/tools/safimm/immdump/imm_xmlw_dump.cc
+++ b/osaf/tools/safimm/immdump/imm_xmlw_dump.cc
@@ -508,6 +508,15 @@ void flagsToXMLw(SaImmAttrDefinitionT_2*
 }
 }
 
+if (flags  SA_IMM_ATTR_NO_DANGLING)
+{   
+if(xmlTextWriterWriteElement(writer, (xmlChar*) flag,
+   (xmlChar*) SA_NO_DANGLING)  0 ) { 
+std::cout  Error at xmlTextWriterWriteElement (flag - 
SA_NO_DANGLING)  std::endl;
+exit(1);
+}   
+}
+
 }
 
 void typeToXMLw(SaImmAttrDefinitionT_2* p, xmlTextWriterPtr writer)
diff --git a/osaf/tools/safimm/immlist/imm_list.c 
b/osaf/tools/safimm/immlist/imm_list.c
--- a/osaf/tools/safimm/immlist/imm_list.c
+++ b/osaf/tools/safimm/immlist/imm_list.c
@@ -323,6 +323,9 @@ static void display_class_definition(con
if (attrDefinition-attrFlags  
SA_IMM_ATTR_NO_DUPLICATES)
printf(, NO_DUPLICATES);
 
+   if (attrDefinition-attrFlags  SA_IMM_ATTR_NO_DANGLING)
+   printf(, NO_DANGLING);
+
} else if (attrDefinition-attrFlags  SA_IMM_ATTR_RUNTIME) {
if (attrDefinition-attrDefaultValue != NULL) {
printf( = );

--
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel