[All] Fix: error: taking address of temporary array.

xrootd · Jan 7, 2020 · 37ede05 · 37ede05
1 parent 0490e13
commit 37ede05
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 20 deletions.
diff --git a/src/Xrd/XrdConfig.cc b/src/Xrd/XrdConfig.cc
@@ -925,8 +925,8 @@ void XrdConfig::setCFG()
 //
    XrdOucStream::Capture(&totalCF);
    totalCF.resize(1024*1024);
-   XrdOucStream::Capture((const char*[]){"*** ",myProg, " config from '",
-                                         cfnP, "':", 0});
+   static const char *cvec[] = { "*** ", myProg, " config from '", cfnP, "':", 0 };
+   XrdOucStream::Capture(cvec);
 }
 
 /******************************************************************************/

diff --git a/src/XrdAcc/XrdAccConfig.cc b/src/XrdAcc/XrdAccConfig.cc
@@ -275,7 +275,8 @@ int XrdAccConfig::ConfigFile(XrdSysError &Eroute, const char *ConfigFN) {
 // Now start reading records until eof.
 //
    ConfigDefaults(); Config.Attach(cfgFD); Config.Tabs(0);
-   Config.Capture((const char*[]){"*** acc plugin config:",0});
+   static const char *cvec[] = { "*** acc plugin config:", 0 };
+   Config.Capture(cvec);
 
    while((var = Config.GetMyFirstWord()))
         {if (!strncmp(var, "acc.", 2))

diff --git a/src/XrdBwm/XrdBwmConfig.cc b/src/XrdBwm/XrdBwmConfig.cc
@@ -106,7 +106,8 @@ int XrdBwm::Configure(XrdSysError &Eroute) {
               return Eroute.Emsg("Config", errno, "open config file",
                                  ConfigFN);
            Config.Attach(cfgFD);
-           Config.Capture((const char*[]){"*** bwm ofs plugin config:",0});
+           static const char *cvec[] = { "*** bwm ofs plugin config:", 0 };
+           Config.Capture(cvec);
 
            // Now start reading records until eof.
            //

diff --git a/src/XrdCms/XrdCmsClientConfig.cc b/src/XrdCms/XrdCmsClientConfig.cc
@@ -237,7 +237,8 @@ int XrdCmsClientConfig::ConfigProc(const char *ConfigFN)
        return 1;
       }
    Config.Attach(cfgFD);
-   Config.Capture((const char*[]){"*** cms plugin config:",0});
+   static const char *cvec[] = { "*** cms plugin config:", 0 };
+   Config.Capture(cvec);
 
 // Now start reading records until eof.
 //

diff --git a/src/XrdDig/XrdDigConfig.cc b/src/XrdDig/XrdDigConfig.cc
@@ -402,7 +402,8 @@ bool XrdDigConfig::ConfigProc(const char *ConfigFN)
        return 1;
       }
    cFile.Attach(cfgFD);
-   cFile.Capture((const char*[]){"*** digfs plugin config:",0});
+   static const char *cvec[] = { "*** digfs plugin config:", 0 };
+   cFile.Capture(cvec);
 
 // Now start reading records until eof.
 //

diff --git a/src/XrdFrc/XrdFrcProxy.cc b/src/XrdFrc/XrdFrcProxy.cc
@@ -277,7 +277,8 @@ int XrdFrcProxy::Init2(const char *ConfigFN)
        return 1;
       }
    cfgFile.Attach(cfgFD);
-   cfgFile.Capture((const char*[]){"*** frm client plugin config:",0});
+   static const char *cvec[] = { "*** frm client plugin config:", 0 };
+   cfgFile.Capture(cvec);
 
 // Now start reading records until eof looking for our directive
 //

diff --git a/src/XrdFrm/XrdFrmConfig.cc b/src/XrdFrm/XrdFrmConfig.cc
@@ -972,7 +972,8 @@ int XrdFrmConfig::ConfigProc()
        return 1;
       }
    cfgFile.Attach(cfgFD); cFile = &cfgFile;
-   cfgFile.Capture((const char*[]){"*** frm server config:",0});
+   static const char *cvec[] = { "*** frm server config:", 0 };
+   cfgFile.Capture(cvec);
 
 // Now start reading records until eof.
 //

diff --git a/src/XrdHttp/XrdHttpProtocol.cc b/src/XrdHttp/XrdHttpProtocol.cc
@@ -1060,7 +1060,8 @@ int XrdHttpProtocol::Config(const char *ConfigFN, XrdOucEnv *myEnv) {
   if ((cfgFD = open(ConfigFN, O_RDONLY, 0)) < 0)
     return eDest.Emsg("Config", errno, "open config file", ConfigFN);
   Config.Attach(cfgFD);
-  Config.Capture((const char*[]){"*** http protocol config:",0});
+  static const char *cvec[] = { "*** http protocol config:", 0 };
+  Config.Capture(cvec);
 
   // Process items
   //

diff --git a/src/XrdMacaroons/XrdMacaroonsConfigure.cc b/src/XrdMacaroons/XrdMacaroonsConfigure.cc
@@ -48,7 +48,8 @@ bool Handler::Config(const char *config, XrdOucEnv *env, XrdSysError *log,
     return log->Emsg("Config", errno, "open config file", config);
   }
   config_obj.Attach(cfg_fd);
-  config_obj.Capture((const char*[]){"*** macaroons plugin config:",0});
+  static const char *cvec[] = { "*** macaroons plugin config:", 0 };
+  config_obj.Capture(cvec);
 
   // Set default mask for logging.
   log->setMsgMask(LogMask::Error | LogMask::Warning);

diff --git a/src/XrdOfs/XrdOfsConfig.cc b/src/XrdOfs/XrdOfsConfig.cc
@@ -184,7 +184,8 @@ int XrdOfs::Configure(XrdSysError &Eroute, XrdOucEnv *EnvInfo) {
               return Eroute.Emsg("Config", errno, "open config file",
                                  ConfigFN);
            Config.Attach(cfgFD);
-           Config.Capture((const char*[]){"*** ofs plugin config:",0});
+           static const char *cvec[] = {"*** ofs plugin config:",0};
+           Config.Capture(cvec);
 
            // Now start reading records until eof.
            //

diff --git a/src/XrdOss/XrdOssConfig.cc b/src/XrdOss/XrdOssConfig.cc
@@ -553,7 +553,8 @@ int XrdOssSys::ConfigProc(XrdSysError &Eroute)
        return 1;
       }
    Config.Attach(cfgFD);
-   Config.Capture((const char*[]){"*** oss plugin config:",0});
+   static const char *cvec[] = { "*** oss plugin config:", 0 };
+   Config.Capture(cvec);
 
 // Now start reading records until eof.
 //

diff --git a/src/XrdPfc/XrdPfcConfiguration.cc b/src/XrdPfc/XrdPfcConfiguration.cc
@@ -171,7 +171,8 @@ bool Cache::Config(const char *config_filename, const char *parameters)
    }
 
    Config.Attach(fd);
-   Config.Capture((const char*[]){"*** pfc plugin config:",0});
+   static const char *cvec[] = { "*** pfc plugin config:", 0 };
+   Config.Capture(cvec);
 
    // Obtain OFS configurator for OSS plugin.
    XrdOfsConfigPI *ofsCfg = XrdOfsConfigPI::New(config_filename,&Config,&m_log,

diff --git a/src/XrdPss/XrdPssConfig.cc b/src/XrdPss/XrdPssConfig.cc
@@ -308,7 +308,8 @@ int XrdPssSys::ConfigProc(const char *Cfn)
        return 1;
       }
    Config.Attach(cfgFD);
-   Config.Capture((const char*[]){"*** pss (oss) plugin config:",0});
+   static const char *cvec[] = { "*** pss (oss) plugin config:", 0 };
+   Config.Capture(cvec);
 
 // Now start reading records until eof.
 //

diff --git a/src/XrdSec/XrdSecServer.cc b/src/XrdSec/XrdSecServer.cc
@@ -502,7 +502,8 @@ int XrdSecServer::ConfigFile(const char *ConfigFN)
 // Now start reading records until eof.
 //
    Config.Attach(cfgFD); Config.Tabs(0);
-   Config.Capture((const char*[]){"*** sec plugin config:",0});
+   static const char *cvec[] = { "*** sec plugin config:", 0 };
+   Config.Capture(cvec);
    while((var = Config.GetMyFirstWord()))
         {if (!strncmp(var, "sec.", 4))
             {recs++;

diff --git a/src/XrdSsi/XrdSsiLogging.cc b/src/XrdSsi/XrdSsiLogging.cc
@@ -81,7 +81,8 @@ void ConfigLog(const char *cFN)
        return;
       }
    cStrm.Attach(cfgFD);
-   cStrm.Capture((const char*[]){"*** ssi logging plugin config:",0});
+   static const char *cvec[] = { "*** ssi logging plugin config:", 0 };
+   cStrm.Capture(cvec);
 
 // Now start reading records until eof.
 //

diff --git a/src/XrdSsi/XrdSsiSfsConfig.cc b/src/XrdSsi/XrdSsiSfsConfig.cc
@@ -188,7 +188,8 @@ bool XrdSsiSfsConfig::Configure(const char *cFN)
        return false;
       }
    cStrm.Attach(cfgFD);
-   cStrm.Capture((const char*[]){"*** ssi (sfs) plugin config:",0});
+   static const char *cvec[] = { "*** ssi (sfs) plugin config:", 0 };
+   cStrm.Capture(cvec);
 
 // Now start reading records until eof.
 //

diff --git a/src/XrdThrottle/XrdThrottleFileSystemConfig.cc b/src/XrdThrottle/XrdThrottleFileSystemConfig.cc
@@ -132,7 +132,8 @@ FileSystem::Configure(XrdSysError & log, XrdSfsFileSystem *native_fs)
       return 1;
    }
    Config.Attach(cfgFD);
-   Config.Capture((const char*[]){"*** throttle (ofs) plugin config:",0});
+   static const char *cvec[] = { "*** throttle (ofs) plugin config:", 0 };
+   Config.Capture(cvec);
 
    std::string fslib = OFS_NAME;
 

diff --git a/src/XrdTpc/XrdTpcConfigure.cc b/src/XrdTpc/XrdTpcConfigure.cc
@@ -112,7 +112,8 @@ bool TPCHandler::Configure(const char *configfn, XrdOucEnv *myEnv)
         return false;
     }
     Config.Attach(cfgFD);
-    Config.Capture((const char*[]){"*** http tpc plugin config:",0});
+    static const char *cvec[] = { "*** http tpc plugin config:", 0 };
+    Config.Capture(cvec);
     const char *val;
     std::string path2, path1 = "default";
     bool path1_alt = false, path2_alt = false;

diff --git a/src/XrdXrootd/XrdXrootdConfig.cc b/src/XrdXrootd/XrdXrootdConfig.cc
@@ -516,7 +516,8 @@ int XrdXrootdProtocol::Config(const char *ConfigFN)
 
    // Indicate what we are about to do in the capture stream
    //
-   Config.Capture((const char*[]){"*** xroot protocol config:",0});
+   static const char *cvec[] = { "*** xroot protocol config:", 0 };
+   Config.Capture(cvec);
 
    // Process items
    //