GCC 6's new 'misleading indentation' warning showed up a few times in OST, so this commit squashes all the current examples of that. Also adds Fedora 24 alpha 7 (x64) + gcc 6.0.0 to the list of tested platforms.

ReadMe-2.4.3

@@ -39,6 +39,7 @@ Linuxes
 - Raspbian 7 (wheezy) (armv6l) + gcc 4.6.3
 - openSuSE Tumbleweed (20160408) (i586) + gcc 5.3.1
 - RHEL 6.0 (powerpc64) + gcc 4.4.4
+- Fedora 24 Alpha 7 (amd64) + gcc 6.0.0
 
 OSX
 - Mac OS X 10.11 + LLVM 7.0.2 / clang-700.1.81

src/fs/fspropset.cpp

@@ -215,10 +215,16 @@ const cFSPropSet& cFSPropSet::operator=(const cFSPropSet& rhs)
     mValidProps = rhs.GetValidVector();
     mUndefinedProps = rhs.mUndefinedProps;
 
-    for(int i=0; i < PROP_NUMITEMS; i++)
+    for (int i=0; i < PROP_NUMITEMS; i++)
+    {
         if (mValidProps.ContainsItem(i) && !mUndefinedProps.ContainsItem(i)) 
-	        GetPropAt(i)->Copy( ((cFSPropSet&)rhs).GetPropAt(i) ); // call non-const GetPropAt for rhs
+        {
+            GetPropAt(i)->Copy( ((cFSPropSet&)rhs).GetPropAt(i) ); 
+            // call non-const GetPropAt for rhs
             // don't want it to assert ContainsItem
+        }
+    }
+
     return *this;
 }
 

src/siggen/siggenmain.cpp

@@ -98,12 +98,10 @@ static void SiggenInit()
 #endif
     iFSServices::SetInstance( &fss );
 
-
     //
     // set up an error bucket that will spit things to stderr
     //
     et.SetChild( &er );
-
 }
 
 int __cdecl _tmain(int argc, const TCHAR** argv)
@@ -185,8 +183,7 @@ int __cdecl _tmain(int argc, const TCHAR** argv)
         }
 	ret = siggen.Execute();
 
-	}//end try block
+    } //end try block
-
     catch (eError& error)
     {
         cErrorReporter::PrintErrorMsg(error);
@@ -195,7 +192,6 @@ int __cdecl _tmain(int argc, const TCHAR** argv)
 
 exit:
 
-
     return ret;
 }//end MAIN
 

src/tripwire/policyupdate.cpp

@@ -280,11 +280,12 @@ bool cPolicyUpdate::Execute( uint32 flags )  // throw (eError)
     
     uint32 updateDBFlags = cUpdateDb::FLAG_REPLACE_PROPS;
     if( flags & FLAG_ERASE_FOOTPRINTS_PU ) 
+    {
         updateDBFlags |= cUpdateDb::FLAG_ERASE_FOOTPRINTS_UD;
+    }
 
     update.Execute( updateDBFlags );
 	
-	
     // the last thing that we have to do is to remove everything that is still
     // in the database that does not belong in the new database (ie -- does not fall under any
     // new rules)
@@ -299,8 +300,9 @@ bool cPolicyUpdate::Execute( uint32 flags )  // throw (eError)
     i.SetErrorBucket(mpBucket);
     
     if( flags & FLAG_ERASE_FOOTPRINTS_PU )
+    {
         i.SetIterFlags( iFCODataSourceIter::DO_NOT_MODIFY_OBJECTS );
-
+    }
     const cFCOSpecListCanonicalIter newPolIter( mNewPolicy );
     util_PruneExtraObjects( i, newPolIter );
 

src/util/fileutil.cpp

@@ -218,6 +218,7 @@ bool cFileUtil::BackupFile(const TSTRING& filename, bool printWarningOnFailure)
 
     // back up the file, preserving permissions and ownership, if possible
     if (cFileUtil::Copy(filename.c_str(), backup_filename.c_str()) == false)
+    {
         if (printWarningOnFailure &&
             iUserNotify::GetInstance()->GetVerboseLevel() >= iUserNotify::V_NORMAL)
         {
@@ -230,7 +231,7 @@ bool cFileUtil::BackupFile(const TSTRING& filename, bool printWarningOnFailure)
 
             cErrorReporter::PrintErrorMsg(eFileUtilBackup(estr, eError::NON_FATAL|eError::SUPRESS_THIRD_MSG));
         }
-
+    }
     return true;
 }