Squelch random indentation warnings from various gcc versions.

xrootd · Jun 22, 2017 · 0caef52 · 0caef52
1 parent 44b5fd9
commit 0caef52
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -403,7 +403,7 @@ int XrdSecsssKT::eMsg(const char *epname, int rc,
    if (txt2)  cerr <<txt2;
    if (txt3)  cerr <<txt3;
    if (txt4)  cerr <<txt4;
-   if (rc>0) {cerr <<"; " <<strerror(rc);}
+  {if (rc>0) {cerr <<"; " <<strerror(rc);}}
               cerr <<endl;
 
    return (rc ? (rc < 0 ? rc : -rc) : -1);

diff --git a/src/XrdXrootd/XrdXrootdAdmin.cc b/src/XrdXrootd/XrdXrootdAdmin.cc
@@ -184,8 +184,8 @@ int XrdXrootdAdmin::do_Abort()
 
 // Send off the unsolicited response
 //
-   if (msg){return sendResp("abort", kXR_asyncab, msg, mlen);}
-            return sendResp("abort", kXR_asyncab);
+   if (msg) return sendResp("abort", kXR_asyncab, msg, mlen);
+      else  return sendResp("abort", kXR_asyncab);
 }
 
 /******************************************************************************/
@@ -512,8 +512,8 @@ int XrdXrootdAdmin::do_Msg()
    msg = getMsg(msg, mlen);
 // Send off the unsolicited response
 //
-   if (msg){return sendResp("msg", kXR_asyncms, msg, mlen);}
-            return sendResp("msg", kXR_asyncms);
+   if (msg) return sendResp("msg", kXR_asyncms, msg, mlen);
+      else  return sendResp("msg", kXR_asyncms);
 }
 
 /******************************************************************************/

diff --git a/src/XrdXrootd/XrdXrootdJob.cc b/src/XrdXrootd/XrdXrootdJob.cc
@@ -634,8 +634,7 @@ void XrdXrootdJob::CleanUp(XrdXrootdJob2Do *jp)
         if (theStatus == XrdXrootdJob2Do::Job_Waiting
         ||  theStatus == XrdXrootdJob2Do::Job_Done)
            Sched->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--;
 }