Przeglądaj źródła

HPCC-15532 Fix various clang warnings

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 9 lat temu
rodzic
commit
052d7dabec

+ 4 - 4
esp/bindings/bindutil.cpp

@@ -67,7 +67,7 @@ static const unsigned char charmap[] = {
     0370, 0371, 0372, 0373, 0374, 0375, 0376, 0377,
 };
 
-unsigned int Utils::hash (register const char *str, register unsigned int len)
+unsigned int Utils::hash (const char *str, unsigned int len)
 {
   static unsigned short asso_values[] =
     {
@@ -292,7 +292,7 @@ __int64 Utils::getLine(__int64 total_len, __int64 cur_pos, const char* buf, int&
     return cur_pos;
 }
 
-int Utils::strncasecmp(const char* s1, const char* s2, register size32_t n) 
+int Utils::strncasecmp(const char* s1, const char* s2, size32_t n)
 {
     bool s1isnull = (s1 == NULL);
     bool s2isnull = (s2 == NULL);
@@ -301,7 +301,7 @@ int Utils::strncasecmp(const char* s1, const char* s2, register size32_t n)
 
     if (n != 0) 
     {
-        register const unsigned char *cm = charmap,
+        const unsigned char *cm = charmap,
                 *us1 = (const unsigned char *)s1,
                 *us2 = (const unsigned char *)s2;
 
@@ -337,7 +337,7 @@ int Utils::strcasecmp(const char* s1, const char* s2)
     if(s1isnull || s2isnull)
         return s1isnull - s2isnull;
 
-    register const unsigned char *cm = charmap,
+    const unsigned char *cm = charmap,
             *us1 = (const unsigned char *)s1,
             *us2 = (const unsigned char *)s2;
 

+ 2 - 2
esp/bindings/bindutil.hpp

@@ -35,12 +35,12 @@ public:
     static void parseNVPair(const char* nv, StringBuffer& name, StringBuffer& value);
     static int getLine(int total_len, int cur_len, const char* buf, int & oneline_len);
     static __int64 getLine(__int64 total_len, __int64 cur_len, const char* buf, int & oneline_len);
-    static int strncasecmp(const char* s1, const char* s2, register size32_t n);
+    static int strncasecmp(const char* s1, const char* s2, size32_t n);
     static int strcasecmp(const char* s1, const char* s2);
     static const char *stristr(const char *haystack, const char *needle);
     static StringBuffer& base64encode(const void *data, long length, StringBuffer& result);
     static int base64decode(int inlen, const char *in, StringBuffer& data);
-    static unsigned int hash (register const char *str, register unsigned int len);
+    static unsigned int hash (const char *str, unsigned int len);
     static StringBuffer &url_encode(const char* url, StringBuffer& encoded_url);
     static int url_decode(const char* param, StringBuffer& result);
     static  void SplitURL(const char* url, StringBuffer& Protocol,StringBuffer& Name,StringBuffer& Password,StringBuffer& FQDN, StringBuffer& Port, StringBuffer& Path);

+ 2 - 2
rtl/eclrtl/eclrtl.cpp

@@ -3652,7 +3652,7 @@ unsigned rtlHash32VUnicode(UChar const * k, unsigned initval)
 unsigned rtlHashData( unsigned length, const void *_k, unsigned initval)
 {
    const unsigned char * k = (const unsigned char *)_k;
-   register unsigned a,b,c,len;
+   unsigned a,b,c,len;
 
    /* Set up the internal state */
    len = length;
@@ -3724,7 +3724,7 @@ unsigned rtlHashVUnicode(UChar const * k, unsigned initval)
 unsigned rtlHashDataNC( unsigned length, const void * _k, unsigned initval)
 {
    const unsigned char * k = (const unsigned char *)_k;
-   register unsigned a,b,c,len;
+   unsigned a,b,c,len;
 
    /* Set up the internal state */
    len = length;

+ 0 - 1
system/jlib/jsocket.cpp

@@ -4756,7 +4756,6 @@ class CSocketEpollHandler: public CInterface, implements ISocketSelectHandler
 {
     CSocketEpollThread *epollthread;
     CriticalSection sect;
-    bool started;
     StringAttr epolltrace;
 public:
     IMPLEMENT_IINTERFACE;

+ 0 - 2
system/jlib/jutil.cpp

@@ -1914,8 +1914,6 @@ class CLinuxAuthenticatedUser: public CInterface, implements IAuthenticatedUser
     gid_t gid;
     uid_t saveuid;
     gid_t savegid;
-    int saveegrplen;
-    gid_t *saveegrp;
 
 public:
     IMPLEMENT_IINTERFACE;