Summary: amfnd: Add missing braces [#1743] Review request for Trac Ticket(s): 1743 Peer Reviewer(s): Gary, Hans, Nagendra, Praveen Pull request to: Affected branch(es): opensaf-5.0.x, default(5.1) Development branch:
-------------------------------- Impacted area Impact y/n -------------------------------- Docs n Build system n RPM/packaging n Configuration files n Startup scripts n SAF services y OpenSAF services n Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): --------------------------------------------- changeset 15be58d75006f89095c295ba7384d3c6430fd5d8 Author: Anders Widell <[email protected]> Date: Fri, 08 Apr 2016 17:48:31 +0200 amfnd: Add missing braces [#1743] 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<S aImmAttrNameT>("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>("s aAmfCompCSIRmvCallbackTimeout"), 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); ^~~~ Complete diffstat: ------------------ osaf/services/saf/amf/amfnd/compdb.cc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Testing Commands: ----------------- Build OpenSAF with GCC 6 and run regression tests. Testing, Expected Results: -------------------------- OpenSAF should build successfully and regression tests should pass. Conditions of Submission: ------------------------- Ack from reviewer(s) Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 y y powerpc n n powerpc64 n n Reviewer Checklist: ------------------- [Submitters: make sure that your review doesn't trigger any checkmarks!] Your checkin has not passed review because (see checked entries): ___ Your RR template is generally incomplete; it has too many blank entries that need proper data filled in. ___ You have failed to nominate the proper persons for review and push. ___ Your patches do not have proper short+long header ___ You have grammar/spelling in your header that is unacceptable. ___ You have exceeded a sensible line length in your headers/comments/text. ___ You have failed to put in a proper Trac Ticket # into your commits. ___ You have incorrectly put/left internal data in your comments/files (i.e. internal bug tracking tool IDs, product names etc) ___ You have not given any evidence of testing beyond basic build tests. Demonstrate some level of runtime or other sanity testing. ___ You have ^M present in some of your files. These have to be removed. ___ You have needlessly changed whitespace or added whitespace crimes like trailing spaces, or spaces before tabs. ___ You have mixed real technical changes with whitespace and other cosmetic code cleanup changes. These have to be separate commits. ___ You need to refactor your submission into logical chunks; there is too much content into a single commit. ___ You have extraneous garbage in your review (merge commits etc) ___ You have giant attachments which should never have been sent; Instead you should place your content in a public tree to be pulled. ___ You have too many commits attached to an e-mail; resend as threaded commits, or place in a public tree for a pull. ___ You have resent this content multiple times without a clear indication of what has changed between each re-send. ___ You have failed to adequately and individually address all of the comments and change requests that were proposed in the initial review. ___ You have a misconfigured ~/.hgrc file (i.e. username, email etc) ___ Your computer have a badly configured date and time; confusing the the threaded patch review. ___ Your changes affect IPC mechanism, and you don't present any results for in-service upgradability test. ___ Your changes affect user manual and documentation, your patch series do not contain the patch that updates the Doxygen manual. ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
