osaf/services/saf/amf/amfnd/compdb.cc | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Add missing braces to fix the following compilation error discovered when using
GCC 6:
compdb.cc: In function 'int comp_init(AVND_COMP*, const SaImmAttrValuesT_2**)':
compdb.cc:1579:2: error: this 'if' clause does not guard...
[-Werror=misleading-indentation]
if
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCompCSISetCallbackTimeout"),
attributes,
^~
compdb.cc:1582:3: note: ...this statement, but the latter is misleadingly
indented as if it is guarded by the 'if'
comp->use_comptype_attr->set(CsiSetCallbackTimeout);
^~~~
compdb.cc:1584:2: error: this 'if' clause does not guard...
[-Werror=misleading-indentation]
if
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCompCSIRmvCallbackTimeout"),
attributes,
^~
compdb.cc:1587:3: note: ...this statement, but the latter is misleadingly
indented as if it is guarded by the 'if'
comp->use_comptype_attr->set(CsiRemoveCallbackTimeout);
^~~~
diff --git a/osaf/services/saf/amf/amfnd/compdb.cc
b/osaf/services/saf/amf/amfnd/compdb.cc
--- a/osaf/services/saf/amf/amfnd/compdb.cc
+++ b/osaf/services/saf/amf/amfnd/compdb.cc
@@ -1577,14 +1577,16 @@ static int comp_init(AVND_COMP *comp, co
comp->clc_info.saAmfCompNumMaxAmStopAttempts =
comp_global_attrs.saAmfNumMaxAmStopAttempts;
if
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCompCSISetCallbackTimeout"),
attributes,
- 0, &comp->csi_set_cbk_timeout) != SA_AIS_OK)
+ 0, &comp->csi_set_cbk_timeout) != SA_AIS_OK) {
comp->csi_set_cbk_timeout = comptype->saAmfCtDefCallbackTimeout;
comp->use_comptype_attr->set(CsiSetCallbackTimeout);
+ }
if
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCompCSIRmvCallbackTimeout"),
attributes,
- 0, &comp->csi_rmv_cbk_timeout) != SA_AIS_OK)
+ 0, &comp->csi_rmv_cbk_timeout) != SA_AIS_OK) {
comp->csi_rmv_cbk_timeout = comptype->saAmfCtDefCallbackTimeout;
comp->use_comptype_attr->set(CsiRemoveCallbackTimeout);
+ }
if
(immutil_getAttr(const_cast<SaImmAttrNameT>("saAmfCompQuiescingCompleteTimeout"),
attributes,
0, &comp->quies_complete_cbk_timeout) != SA_AIS_OK)
{
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
