Merge lp:~skinny.moey/drizzle/drizzle-warnings-conversion into lp:~drizzle-trunk/drizzle/development

[Joe Daly]

[Joe Daly (skinny.moey)]

Changes to eventually enable -Wconversion to be turned on.

[Jay Pipes (jaypipes)]

Well, Joe, you've picked some of the ugliest code to dig into! :)

I'm going to take some extra time and review this carefully. There are a couple things I'm concerned about and want to double-check with my C++ standards books to verify.

Namely:

1) There are a couple places where I see uint32_t being used where I believe ptr_diff_t is appropriate.

2) static_cast<short unsigned int>() should be static_cast<uint16_t>() ?

3) static_cast<unsigned long>() should be static_cast<uint32_t>() ?

Anyway, I just want to make sure, so there may be a bit of a delay on this, ok?

Thanks for your patience!

Jay

[Stewart Smith (stewart)]

What about enabling -Wconversion as we go through places that can be built with it? e.g. I guess after this patch we could do it for mysys/ ?

[Joe Daly (skinny.moey)]

> What about enabling -Wconversion as we go through places that can be built
> with it? e.g. I guess after this patch we could do it for mysys/ ?

Good idea! I should be able enable it for mystrings and mysys in my next commit.

[lp:~skinny.moey/drizzle/drizzle-warnings-conversion]

1137. By Joe Daly on 2009-10-02

update with trunk

1138. By Joe Daly on 2009-10-02

style change

1139. By Joe Daly on 2009-10-02

change unsigned long to uint32_t

1140. By Joe Daly on 2009-10-02

change short unsigned int to uint16_t

Unmerged revisions

1140. By Joe Daly on 2009-10-02

change short unsigned int to uint16_t

1139. By Joe Daly on 2009-10-02

change unsigned long to uint32_t

1138. By Joe Daly on 2009-10-02

style change

1137. By Joe Daly on 2009-10-02

update with trunk

1136. By Joe Daly on 2009-09-24

Changes to allow compilation with -Wconversion turned on. Also change iteration type to uint16_t from uint32_t this was producing a conversion warning, there is no need for a conversion, rather change the index type.

1135. By Joe Daly on 2009-09-24

merge with trunk

1134. By Joe Daly on 2009-09-24

changes to allow -Wconversiion to be turned on

1133. By Joe Daly on 2009-09-24

changes to allow -Wconversiion to be turned on

1132. By Joe Daly on 2009-09-24

changes to allow -Wconversiion to be turned on

1131. By Joe Daly on 2009-09-24

changes to allow -Wconversiion to be turned on

=== modified file 'mystrings/ctype-bin.cc'
--- mystrings/ctype-bin.cc	2009-07-07 09:06:29 +0000
+++ mystrings/ctype-bin.cc	2009-10-02 12:21:10 +0000
@@ -284,8 +284,8 @@
 
   for (; pos < (unsigned char*) key ; pos++)
   {
-    nr1[0]^=(ulong) ((((uint32_t) nr1[0] & 63)+nr2[0]) *
-	     ((uint32_t)*pos)) + (nr1[0] << 8);
+    nr1[0]^= ((nr1[0] & 63) + nr2[0]) * (static_cast<uint32_t>(*pos)) +
+              (nr1[0] << 8);
     nr2[0]+=3;
   }
 }
@@ -301,8 +301,8 @@
 
   for (; pos < (unsigned char*) key ; pos++)
   {
-    nr1[0]^=(ulong) ((((uint32_t) nr1[0] & 63)+nr2[0]) *
-	     ((uint32_t)*pos)) + (nr1[0] << 8);
+    nr1[0]^= ((nr1[0] & 63) + nr2[0]) * (static_cast<uint32_t>(*pos)) +
+              (nr1[0] << 8);
     nr2[0]+=3;
   }
 }
@@ -405,7 +405,7 @@
   if (dst != src)
     memcpy(dst, src, srclen);
   return my_strxfrm_pad_desc_and_reverse(cs, dst, dst + srclen, dst + dstlen,
-                                         nweights - srclen, flags, 0);
+                                         static_cast<uint32_t>(nweights - srclen), flags, 0);
 }
 
 
@@ -451,13 +451,14 @@
         if (nmatch > 0)
 	{
 	  match[0].beg= 0;
-	  match[0].end= (size_t) (str- (const unsigned char*)b-1);
+	  match[0].end= static_cast<uint32_t>((str -
+                          reinterpret_cast<const unsigned char*>(b) - 1));
 	  match[0].mb_len= match[0].end;
 
 	  if (nmatch > 1)
 	  {
 	    match[1].beg= match[0].end;
-	    match[1].end= match[0].end+s_length;
+	    match[1].end= static_cast<uint32_t>(match[0].end + s_length);
 	    match[1].mb_len= match[1].end-match[1].beg;
 	  }
 	}
 
=== modified file 'mystrings/ctype-mb.cc'
--- mystrings/ctype-mb.cc	2009-07-09 00:04:44 +0000
+++ mystrings/ctype-mb.cc	2009-10-02 12:21:10 +0000
@@ -348,12 +348,12 @@
         if (nmatch)
         {
           match[0].beg= 0;
-          match[0].end= (size_t) (b-b0);
+          match[0].end= static_cast<uint32_t>(b - b0);
           match[0].mb_len= res;
           if (nmatch > 1)
           {
             match[1].beg= match[0].end;
-            match[1].end= match[0].end+s_length;
+            match[1].end= static_cast<uint32_t>(match[0].end + s_length);
             match[1].mb_len= 0;	/* Not computed */
           }
         }
@@ -582,8 +582,8 @@
 
   for (; pos < (const unsigned char*) key ; pos++)
   {
-    nr1[0]^=(ulong) ((((uint32_t) nr1[0] & 63)+nr2[0]) *
-	     ((uint32_t)*pos)) + (nr1[0] << 8);
+    nr1[0]^= ((nr1[0] & 63) + nr2[0]) * (static_cast<uint32_t>(*pos)) + 
+              (nr1[0] << 8);
     nr2[0]+=3;
   }
 }
@@ -616,8 +616,10 @@
     return;
   }
 
-  buflen= cs->cset->wc_mb(cs, cs->max_sort_char, (unsigned char*) buf,
-                          (unsigned char*) buf + sizeof(buf));
+  buflen= static_cast<char>(cs->cset->wc_mb(cs, cs->max_sort_char, 
+                            reinterpret_cast<unsigned char*>(buf),
+                            reinterpret_cast<unsigned char*>(buf) 
+                              + sizeof(buf)));
 
   assert(buflen > 0);
   do
@@ -1126,7 +1128,7 @@
       continue;
     }
     b+= mb_len;
-    pg= (wc >> 8) & 0xFF;
+    pg= static_cast<uint32_t>((wc >> 8) & 0xFF);
     clen+= utr11_data[pg].p ? utr11_data[pg].p[wc & 0xFF] : utr11_data[pg].page;
     clen++;
   }
 
=== modified file 'mystrings/ctype-simple.cc'
--- mystrings/ctype-simple.cc	2009-06-24 22:50:51 +0000
+++ mystrings/ctype-simple.cc	2009-10-02 12:21:10 +0000
@@ -84,7 +84,7 @@
   unsigned char *d0= dst;
   uint32_t frmlen;
   if ((frmlen= min((uint32_t)dstlen, nweights)) > srclen)
-    frmlen= srclen;
+    frmlen= static_cast<uint32_t>(srclen);
   if (dst != src)
   {
     const unsigned char *end;
@@ -318,8 +318,9 @@
 
   for (; key < end ; key++)
   {
-    nr1[0]^=(ulong) ((((uint32_t) nr1[0] & 63)+nr2[0]) *
-	     ((uint32_t) sort_order[(uint32_t) *key])) + (nr1[0] << 8);
+    nr1[0]^= ((nr1[0] & 63) + nr2[0]) *
+              (static_cast<uint32_t>(sort_order[static_cast<uint32_t>(*key)])) +
+              (nr1[0] << 8);
     nr2[0]+=3;
   }
 }
@@ -400,11 +401,11 @@
   for (c = *s; s != e; c = *++s)
   {
     if (c>='0' && c<='9')
-      c -= '0';
+      c= static_cast<unsigned char>(c - '0');
     else if (c>='A' && c<='Z')
-      c = c - 'A' + 10;
+      c= static_cast<unsigned char>(c - 'A' + 10);
     else if (c>='a' && c<='z')
-      c = c - 'a' + 10;
+      c= static_cast<unsigned char>(c - 'a' + 10);
     else
       break;
     if (c >= base)
@@ -522,11 +523,11 @@
   for (c = *s; s != e; c = *++s)
   {
     if (c>='0' && c<='9')
-      c -= '0';
+      c= static_cast<unsigned char>(c - '0');
     else if (c>='A' && c<='Z')
-      c = c - 'A' + 10;
+      c= static_cast<unsigned char>(c - 'A' + 10);
     else if (c>='a' && c<='z')
-      c = c - 'a' + 10;
+      c= static_cast<unsigned char>(c - 'a' + 10);
     else
       break;
     if (c >= base)
@@ -637,11 +638,11 @@
   {
     register unsigned char c= *s;
     if (c>='0' && c<='9')
-      c -= '0';
+      c= static_cast<unsigned char>(c - '0');
     else if (c>='A' && c<='Z')
-      c = c - 'A' + 10;
+      c= static_cast<unsigned char>(c - 'A' + 10);
     else if (c>='a' && c<='z')
-      c = c - 'a' + 10;
+      c= static_cast<unsigned char>(c - 'a' + 10);
     else
       break;
     if (c >= base)
@@ -761,11 +762,11 @@
     register unsigned char c= *s;
 
     if (c>='0' && c<='9')
-      c -= '0';
+      c= static_cast<unsigned char>(c - '0');
     else if (c>='A' && c<='Z')
-      c = c - 'A' + 10;
+      c= static_cast<unsigned char>(c - 'A' + 10);
     else if (c>='a' && c<='z')
-      c = c - 'a' + 10;
+      c= static_cast<unsigned char>(c - 'a' + 10);
     else
       break;
     if (c >= base)
@@ -866,13 +867,14 @@
   }
 
   new_val = (long) (uval / 10);
-  *--p    = '0'+ (char) (uval - (unsigned long) new_val * 10);
+  *--p= static_cast<char>('0'+ static_cast<char>(uval -
+          static_cast<uint32_t>(new_val) * 10));
   val     = new_val;
 
   while (val != 0)
   {
     new_val=val/10;
-    *--p = '0' + (char) (val-new_val*10);
+    *--p= static_cast<char>('0' + static_cast<char>(val-new_val*10));
     val= new_val;
   }
 
@@ -918,7 +920,7 @@
   {
     uint64_t quo= uval/(uint32_t) 10;
     uint32_t rem= (uint32_t) (uval- quo* (uint32_t) 10);
-    *--p = '0' + rem;
+    *--p= static_cast<char>('0' + rem);
     uval= quo;
   }
 
@@ -1215,13 +1217,14 @@
 	if (nmatch > 0)
 	{
 	  match[0].beg= 0;
-	  match[0].end= (size_t) (str- (const unsigned char*)b-1);
+	  match[0].end= static_cast<uint32_t>(str - 
+	    reinterpret_cast<const unsigned char*>(b) - 1);
 	  match[0].mb_len= match[0].end;
 
 	  if (nmatch > 1)
 	  {
 	    match[1].beg= match[0].end;
-	    match[1].end= match[0].end+s_length;
+	    match[1].end= match[0].end + static_cast<uint32_t>(s_length);
 	    match[1].mb_len= match[1].end-match[1].beg;
 	  }
 	}
@@ -1315,7 +1318,7 @@
       if (wc >= idx[i].uidx.from && wc <= idx[i].uidx.to && wc)
       {
         int ofs= wc - idx[i].uidx.from;
-        idx[i].uidx.tab[ofs]= ch;
+        idx[i].uidx.tab[ofs]= static_cast<unsigned char>(ch);
       }
     }
   }
@@ -1344,7 +1347,7 @@
 static void set_max_sort_char(CHARSET_INFO *cs)
 {
   unsigned char max_char;
-  uint32_t  i;
+  uint16_t  i;
 
   if (!cs->sort_order)
     return;
@@ -1529,7 +1532,7 @@
     }
   }
 
-  digits= str - beg;
+  digits= static_cast<int>(str - beg);
 
   /* Continue to accumulate into uint64_t */
   for (dot= NULL, ull= ul; str < end; str++)
@@ -1566,7 +1569,7 @@
       }
       else
       {
-        shift= dot - str;
+        shift= static_cast<int>(dot - str);
         for ( ; str < end && (ch= (unsigned char) (*str - '0')) < 10; str++) {}
       }
       goto exp;
@@ -1590,7 +1593,7 @@
     /* Unknown character, exit the loop */
     break;
   }
-  shift= dot ? dot - str : 0; /* Right shift */
+  shift= dot ? static_cast<int>(dot - str) : 0; /* Right shift */
   addon= 0;
 
 exp:    /* [ E [ <sign> ] <unsigned integer> ] */
@@ -1865,14 +1868,14 @@
       for (strend--; str <= strend;)
       {
         unsigned char tmp= *str;
-        *str++= ~*strend;
-        *strend--= ~tmp;
+        *str++= static_cast<unsigned char>(~*strend);
+        *strend--= static_cast<unsigned char>(~tmp);
       }
     }
     else
     {
       for (; str < strend; str++)
-        *str= ~*str;
+        *str= static_cast<unsigned char>(~*str);
     }
   }
   else if (flags & (MY_STRXFRM_REVERSE_LEVEL1 << level))
 
=== modified file 'mystrings/ctype-uca.cc'
--- mystrings/ctype-uca.cc	2009-07-09 00:46:46 +0000
+++ mystrings/ctype-uca.cc	2009-10-02 12:21:10 +0000
@@ -6828,8 +6828,8 @@
     }
     else
     {
-      scanner->page= wc >> 8;
-      scanner->code= wc & 0xFF;
+      scanner->page= static_cast<int>(wc >> 8);
+      scanner->code= static_cast<int>(wc & 0xFF);
     }
 
     if (scanner->contractions && !scanner->page &&
@@ -6840,8 +6840,8 @@
       if (((mb_len= scanner->cs->cset->mb_wc(scanner->cs, &wc,
                                             scanner->sbeg,
                                             scanner->send)) >=0) &&
-           (!(page1= (wc >> 8))) &&
-           ((code1= (wc & 0xFF)) > 0x40) &&
+           (!(page1= static_cast<uint32_t>(wc >> 8))) &&
+           ((code1= static_cast<uint32_t>(wc & 0xFF)) > 0x40) &&
            (code1 < 0x80) &&
            (cweight= scanner->contractions[(scanner->code-0x40)*0x40 + code1-0x40]))
       {
@@ -6862,7 +6862,7 @@
 implicit:
 
   scanner->code= (scanner->page << 8) + scanner->code;
-  scanner->implicit[0]= (scanner->code & 0x7FFF) | 0x8000;
+  scanner->implicit[0]= static_cast<uint16_t>((scanner->code & 0x7FFF) | 0x8000);
   scanner->implicit[1]= 0;
   scanner->wbeg= scanner->implicit;
 
@@ -7141,8 +7141,8 @@
   for (; dst < de && nweights &&
          (s_res= scanner_handler->next(&scanner)) > 0 ; nweights--)
   {
-    *dst++= s_res >> 8;
-    *dst++= s_res & 0xFF;
+    *dst++= static_cast<unsigned char>(s_res >> 8);
+    *dst++= static_cast<unsigned char>(s_res & 0xFF);
   }
 
   if (dst < de && nweights && (flags & MY_STRXFRM_PAD_WITH_SPACE))
@@ -7151,8 +7151,8 @@
     s_res= cs->sort_order_big[0][0x20 * cs->sort_order[0]];
     for (; space_count ; space_count--)
     {
-      *dst++= s_res >> 8;
-      *dst++= s_res & 0xFF;
+      *dst++= static_cast<unsigned char>(s_res >> 8);
+      *dst++= static_cast<unsigned char>(s_res & 0xFF);
     }
   }
   my_strxfrm_desc_and_reverse(d0, dst, flags, 0);
@@ -7769,7 +7769,8 @@
     if (!newweights[pagec])
     {
       /* Alloc new page and copy the default UCA weights */
-      uint32_t size= 256*newlengths[pagec]*sizeof(uint16_t);
+      uint32_t size= static_cast<uint32_t>(256 * newlengths[pagec] *
+                                           sizeof(uint16_t));
 
       if (!(newweights[pagec]= (uint16_t*) (*alloc)(size)))
         return 1;
@@ -7793,7 +7794,8 @@
            defweights[pageb] + chb*deflengths[pageb],
            deflengths[pageb]*sizeof(uint16_t));
     /* Apply primary difference */
-    newweights[pagec][chc*newlengths[pagec]]+= rule[i].diff[0];
+    newweights[pagec][chc*newlengths[pagec]]= static_cast<uint16_t>(
+      newweights[pagec][chc*newlengths[pagec]] + rule[i].diff[0]);
   }
 
   /* Copy non-overwritten pages from the default UCA weights */
@@ -7844,7 +7846,8 @@
         offsc= (rule[i].curr[0]-0x40)*0x40+(rule[i].curr[1]-0x40);
 
         /* Copy base weight applying primary difference */
-        cs->contractions[offsc]= offsb[0] + rule[i].diff[0];
+        cs->contractions[offsc]= static_cast<uint16_t>(
+                                   offsb[0] + rule[i].diff[0]);
         /* Mark both letters as "is contraction part */
         contraction_flags[rule[i].curr[0]]= 1;
         contraction_flags[rule[i].curr[1]]= 1;
 
=== modified file 'mysys/ptr_cmp.cc'
--- mysys/ptr_cmp.cc	2009-04-26 16:53:32 +0000
+++ mysys/ptr_cmp.cc	2009-10-02 12:21:10 +0000
@@ -53,7 +53,7 @@
 
 static int ptr_compare(size_t *compare_length, unsigned char **a, unsigned char **b)
 {
-  register int length= *compare_length;
+  register int length= static_cast<int>(*compare_length);
   register unsigned char *first,*last;
 
   first= *a; last= *b;
@@ -68,7 +68,7 @@
 
 static int ptr_compare_0(size_t *compare_length,unsigned char **a, unsigned char **b)
 {
-  register int length= *compare_length;
+  register int length= static_cast<int>(*compare_length);
   register unsigned char *first,*last;
 
   first= *a; last= *b;
@@ -89,7 +89,7 @@
 
 static int ptr_compare_1(size_t *compare_length,unsigned char **a, unsigned char **b)
 {
-  register int length= *compare_length-1;
+  register int length= static_cast<int>(*compare_length-1);
   register unsigned char *first,*last;
 
   first= *a+1; last= *b+1;
@@ -110,7 +110,7 @@
 
 static int ptr_compare_2(size_t *compare_length,unsigned char **a, unsigned char **b)
 {
-  register int length= *compare_length-2;
+  register int length= static_cast<int>(*compare_length-2);
   register unsigned char *first,*last;
 
   first= *a +2 ; last= *b +2;
@@ -132,7 +132,7 @@
 
 static int ptr_compare_3(size_t *compare_length,unsigned char **a, unsigned char **b)
 {
-  register int length= *compare_length-3;
+  register int length= static_cast<int>(*compare_length-3);
   register unsigned char *first,*last;
 
   first= *a +3 ; last= *b +3;
 
=== modified file 'mysys/tree.cc'
--- mysys/tree.cc	2009-04-17 21:01:47 +0000
+++ mysys/tree.cc	2009-10-02 12:21:10 +0000
@@ -103,15 +103,18 @@
     */
     tree->offset_to_key=sizeof(TREE_ELEMENT); /* Put key after element */
     /* Fix allocation size so that we don't lose any memory */
-    default_alloc_size/=(sizeof(TREE_ELEMENT)+size);
+    default_alloc_size= static_cast<uint32_t>(
+      default_alloc_size / (sizeof(TREE_ELEMENT)+size));
     if (!default_alloc_size)
       default_alloc_size=1;
-    default_alloc_size*=(sizeof(TREE_ELEMENT)+size);
+    default_alloc_size= static_cast<uint32_t>(
+      default_alloc_size * (sizeof(TREE_ELEMENT)+size));
   }
   else
   {
     tree->offset_to_key=0;		/* use key through pointer */
-    tree->size_of_element+=sizeof(void*);
+    tree->size_of_element= static_cast<uint32_t>(
+      tree->size_of_element + sizeof(void*));
   }
   if (!(tree->with_delete=with_delete))
   {
@@ -206,7 +209,8 @@
   }
   if (element == &tree->null_element)
   {
-    uint32_t alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
+    uint32_t alloc_size= static_cast<uint32_t>(
+      sizeof(TREE_ELEMENT) + key_size + tree->size_of_element); 
     tree->allocated+=alloc_size;
 
     if (tree->memory_limit && tree->elements_in_tree
@@ -308,7 +312,8 @@
     rb_delete_fixup(tree,parent);
   if (tree->free)
     (*tree->free)(ELEMENT_KEY(tree,element), free_free, tree->custom_arg);
-  tree->allocated-= sizeof(TREE_ELEMENT) + tree->size_of_element + key_size;
+  tree->allocated= static_cast<uint32_t>(
+    tree->allocated - sizeof(TREE_ELEMENT) + tree->size_of_element + key_size);
   free((unsigned char*) element);
   tree->elements_in_tree--;
   return 0;