From 0caef52174c1d81a26c49be5924833b98766a1a6 Mon Sep 17 00:00:00 2001 From: Andrew Hanushevsky Date: Thu, 22 Jun 2017 14:12:27 -0700 Subject: [PATCH] Squelch random indentation warnings from various gcc versions. --- src/XrdOfs/XrdOfsEvs.cc | 3 ++- src/XrdOuc/XrdOucUtils.cc | 16 ++++++++-------- src/XrdPosix/XrdPosixXrootd.hh | 4 ++-- src/XrdSeckrb5/XrdSecProtocolkrb5.cc | 2 +- src/XrdSecsss/XrdSecsssKT.cc | 2 +- src/XrdXrootd/XrdXrootdAdmin.cc | 8 ++++---- src/XrdXrootd/XrdXrootdJob.cc | 3 +-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/XrdOfs/XrdOfsEvs.cc b/src/XrdOfs/XrdOfsEvs.cc index ba8e3a0f504..61f3e2cec4b 100644 --- a/src/XrdOfs/XrdOfsEvs.cc +++ b/src/XrdOfs/XrdOfsEvs.cc @@ -260,8 +260,9 @@ void XrdOfsEvs::Notify(Event eID, XrdOfsEvsInfo &Info) // if (!(tp = getMsg(isBig))) {if ((++warnings & 0xff) == 1) - eDest->Emsg("Notify", "Ran out of message objects;", eName(eNum), + {eDest->Emsg("Notify", "Ran out of message objects;", eName(eNum), "event notification not sent."); + } return; } diff --git a/src/XrdOuc/XrdOucUtils.cc b/src/XrdOuc/XrdOucUtils.cc index 74a810f474e..370328c03b7 100644 --- a/src/XrdOuc/XrdOucUtils.cc +++ b/src/XrdOuc/XrdOucUtils.cc @@ -136,7 +136,7 @@ int XrdOucUtils::doIf(XrdSysError *eDest, XrdOucStream &Config, while(!strcmp(val, "defined")) {if (!(val = Config.GetWord()) || *val != '?') {if (eDest) - eDest->Emsg("Config","'?var' missing after 'defined' in",what); + {eDest->Emsg("Config","'?var' missing after 'defined' in",what);} return -1; } // Get environment if we have none @@ -154,18 +154,18 @@ int XrdOucUtils::doIf(XrdSysError *eDest, XrdOucStream &Config, if (!val || !isDef) return isDef; if (strcmp(val, "&&")) {if (eDest) - eDest->Emsg("Config",val,"is invalid for defined test in",what); + {eDest->Emsg("Config",val,"is invalid for defined test in",what);} return -1; } else { if (!(val = Config.GetWord())) {if (eDest) - eDest->Emsg("Config","missing keyword after '&&' in",what); + {eDest->Emsg("Config","missing keyword after '&&' in",what);} return -1; } } if (!is1of(val, brk)) {if (eDest) - eDest->Emsg("Config",val,"is invalid after '&&' in",what); + {eDest->Emsg("Config",val,"is invalid after '&&' in",what);} return -1; } } @@ -176,7 +176,7 @@ int XrdOucUtils::doIf(XrdSysError *eDest, XrdOucStream &Config, if (!strcmp(val, "exec")) {if (!(val = Config.GetWord()) || !strcmp(val, "&&")) {if (eDest) - eDest->Emsg("Config","Program name missing after 'if exec' in",what); + {eDest->Emsg("Config","Program name missing after 'if exec' in",what);} return -1; } @@ -192,12 +192,12 @@ int XrdOucUtils::doIf(XrdSysError *eDest, XrdOucStream &Config, if (!(val = Config.GetWord())) {if (eDest) - eDest->Emsg("Config","Keyword missing after '&&' in",what); + {eDest->Emsg("Config","Keyword missing after '&&' in",what);} return -1; } if (strcmp(val, "named")) {if (eDest) - eDest->Emsg("Config",val,"is invalid after '&&' in",what); + {eDest->Emsg("Config",val,"is invalid after '&&' in",what);} return -1; } } @@ -207,7 +207,7 @@ int XrdOucUtils::doIf(XrdSysError *eDest, XrdOucStream &Config, // if (!(val = Config.GetWord())) {if (eDest) - eDest->Emsg("Config","Instance name missing after 'if named' in", what); + {eDest->Emsg("Config","Instance name missing after 'if named' in", what);} return -1; } diff --git a/src/XrdPosix/XrdPosixXrootd.hh b/src/XrdPosix/XrdPosixXrootd.hh index af65a1ee2a2..d95958a4fac 100644 --- a/src/XrdPosix/XrdPosixXrootd.hh +++ b/src/XrdPosix/XrdPosixXrootd.hh @@ -329,11 +329,11 @@ static int Unlink(const char *path); //! is returned and errno is appropriately set. //----------------------------------------------------------------------------- -static ssize_t VRead(int fildes, const XrdOucIOVec *readV, int n); - static void VRead(int fildes, const XrdOucIOVec *readV, int n, XrdPosixCallBackIO *cbp); // Async extension! +static ssize_t VRead(int fildes, const XrdOucIOVec *readV, int n); + //----------------------------------------------------------------------------- //! Write() conforms to POSIX.1-2001 write() //----------------------------------------------------------------------------- diff --git a/src/XrdSeckrb5/XrdSecProtocolkrb5.cc b/src/XrdSeckrb5/XrdSecProtocolkrb5.cc index daf4a54e11f..aa4b9923db2 100644 --- a/src/XrdSeckrb5/XrdSecProtocolkrb5.cc +++ b/src/XrdSeckrb5/XrdSecProtocolkrb5.cc @@ -199,7 +199,7 @@ char XrdSecProtocolkrb5::ExpFile[XrdSecMAXPATHLEN] = "/tmp/krb5cc void XrdSecProtocolkrb5::Delete() { - if (Parms) free(Parms); Parms = 0; + if (Parms) {free(Parms); Parms = 0;} if (Creds) krb5_free_creds(krb_context, Creds); if (Ticket) krb5_free_ticket(krb_context, Ticket); if (AuthContext) krb5_auth_con_free(krb_context, AuthContext); diff --git a/src/XrdSecsss/XrdSecsssKT.cc b/src/XrdSecsss/XrdSecsssKT.cc index 5ac8eeac49f..8fc8a0a6e0c 100644 --- a/src/XrdSecsss/XrdSecsssKT.cc +++ b/src/XrdSecsss/XrdSecsssKT.cc @@ -403,7 +403,7 @@ int XrdSecsssKT::eMsg(const char *epname, int rc, if (txt2) cerr <0) {cerr <<"; " <0) {cerr <<"; " <Schedule((XrdJob *)jp); - else if (theStatus == XrdXrootdJob2Do::Job_Active) - jp->jobStream.Drain(); + else{if (theStatus == XrdXrootdJob2Do::Job_Active) jp->jobStream.Drain();} if (theStatus == XrdXrootdJob2Do::Job_Waiting) numJobs--; }