Fix various platform-specific compilation issues.

xrootd · Feb 6, 2015 · c9541c1 · c9541c1
1 parent c146bf2
commit c9541c1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/XProtocol/YProtocol.hh b/src/XProtocol/YProtocol.hh
@@ -225,7 +225,7 @@ enum  {kYR_refresh = 0x0001,
        kYR_retipmsk= 0x3000,  // Mask  to isolate retipcxx bits
        kYR_retipsft= 12,      // Shift to convert retipcxx bits
        kYR_listall = 0x4000,  // List everything regardless of other settings
-       kYR_prvtnet = 0x8000,  // Client is using a orivate address
+       kYR_prvtnet = 0x8000   // Client is using a orivate address
       };
 //     kXR_string    Path;
 
@@ -470,7 +470,7 @@ enum  {kYR_refresh = 0x0001,
        kYR_retipv64= 0x3000,  // Client is IPv6 IPv4
        kYR_retipmsk= 0x3000,  // Mask  to isolate retipcxx bits
        kYR_retipsft= 12,      // Shift to convert retipcxx bits
-       kYR_prvtnet = 0x8000,  // Client is using a orivate address
+       kYR_prvtnet = 0x8000   // Client is using a orivate address
       };
 //     kXR_string    Path;
 //     kXR_string    Opaque; // Optional

diff --git a/src/XrdCms/XrdCmsCluster.cc b/src/XrdCms/XrdCmsCluster.cc
@@ -324,7 +324,7 @@ void XrdCmsCluster::BlackList(XrdOucTList *blP)
 {
    static CmsDiscRequest discRequest = {{0, kYR_disc, 0, 0}};
    XrdCmsNode *nP;
-   const char *etxt;
+   const char *etxt = "blacklisted.";
    int i, blRD;
    bool inBL;
 

diff --git a/src/XrdCms/XrdCmsLogin.cc b/src/XrdCms/XrdCmsLogin.cc
@@ -273,7 +273,7 @@ int XrdCmsLogin::SendErrorBL(XrdLink *Link)
 int XrdCmsLogin::SendErrorBL(XrdLink *Link, char *rbuff, int rblen)
 {
   CmsRRHdr Rsp = {0, kYR_try, CmsTryRequest::kYR_permtop, htons(rblen)};
-  struct iovec iov[2] = {{&Rsp, sizeof(Rsp)}, {rbuff, rblen}};
+  struct iovec iov[2] = {{(char *)&Rsp, sizeof(Rsp)}, {rbuff, (size_t)rblen}};
   char msgbuff[2048];
 
 // Send off the data

diff --git a/src/XrdCms/XrdCmsManager.cc b/src/XrdCms/XrdCmsManager.cc
@@ -53,15 +53,18 @@
 #include "XrdSys/XrdSysError.hh"
 #include "XrdSys/XrdSysTimer.hh"
 
-using namespace XrdCms;
-
 /******************************************************************************/
 /*                        G l o b a l   O b j e c t s                         */
 /******************************************************************************/
 
-extern XrdSysError     XrdCms::Say;
+namespace XrdCms
+{
+extern XrdSysError     Say;
+
+extern XrdOucTrace     Trace;
+}
 
-extern XrdOucTrace     XrdCms::Trace;
+using namespace XrdCms;
 
 /******************************************************************************/
 /*                        S t a t i c   M e m b e r s                         */