colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of 'misleading indentation' warnings exposed by the big tab->spaces commit yesterday.

This commit is contained in:
Brian Cox 2016-04-23 12:34:04 -07:00
parent 6fc0714d3f
commit 773e3b5487
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/msystem.cpp
View File

@ -961,7 +961,8 @@ int mask;
/* /*
* parent process: if couldn't create child, error * parent process: if couldn't create child, error
*/ */
if (ch_pid != -1){ if (ch_pid != -1)
{
/* /*
* ignore any signals until child dies * ignore any signals until child dies
*/ */
@ -981,20 +982,23 @@ int mask;
/* /*
* use a stdio interface for uniformity * use a stdio interface for uniformity
*/ */
if (fp != NULL){ if (fp != NULL)
if (fp[0] != NULL) {
if (fp[0] != NULL)
fp[0] = fdopen(p[0][1], "w"); fp[0] = fdopen(p[0][1], "w");
else else
(void) close(p[0][1]); (void) close(p[0][1]);
if (fp[1] != NULL)
if (fp[1] != NULL)
fp[1] = fdopen(p[1][0], "r"); fp[1] = fdopen(p[1][0], "r");
else else
(void) close(p[1][0]); (void) close(p[1][0]);
if (fp[2] != NULL)
if (fp[2] != NULL)
fp[2] = fdopen(p[2][0], "r"); fp[2] = fdopen(p[2][0], "r");
else else
(void) close(p[2][0]); (void) close(p[2][0]);
} }
} }
/* /*
* return child's PID * return child's PID

5
src/tw/textreportviewer.cpp
View File

@ -1781,9 +1781,8 @@ bool cEmailReportViewer::IgnoreThisSpec(const cFCOSpecAttr *attr)
// IgnoreThisSpec - returns false if the email address is specified // IgnoreThisSpec - returns false if the email address is specified
// for the given spec attributes. // for the given spec attributes.
if (mbForceFullReport) if (mbForceFullReport)
return false; return false;
// loop through all email addresses for this spec // loop through all email addresses for this spec
cFCOSpecAttrEmailIter emailIter(*attr); cFCOSpecAttrEmailIter emailIter(*attr);

2
src/tw/twstrings.cpp
View File

@ -253,7 +253,7 @@ TSS_BeginStringtable( cTW )
TSS_StringEntry( tw::STR_TSS_PRODUCT_NAME, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR ), TSS_StringEntry( tw::STR_TSS_PRODUCT_NAME, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR ),
TSS_StringEntry( tw::STR_VERSION, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for "TARGET_OS"\n\n") TSS_COPYRIGHT_NOTICE ), TSS_StringEntry( tw::STR_VERSION, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for "TARGET_OS"\n\n") TSS_COPYRIGHT_NOTICE ),
TSS_StringEntry( tw::STR_VERSION_LONG, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for "TARGET_OS"\n\n") TSS_COPYRIGHT_NOTICE_LONG ), TSS_StringEntry( tw::STR_VERSION_LONG, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for "TARGET_OS"\n\n") TSS_COPYRIGHT_NOTICE_LONG ),
TSS_EndStringtable( cTW ) TSS_EndStringtable( cTW )