Merge lp:~vjsamuel/drizzle/fix-casts-drizzle-client into lp:drizzle/7.0

[Vijay Samuel]

[Olaf van der Spek (olafvdspek)]

> if (!(histfile_tmp= (char*) malloc(static_cast<uint32_t>(strlen(histfile) + 5))))
> const char * start = const_cast<const char *>(set);
> return (const_cast<const char *>(str));

Are these casts necessary at all?

review: Needs Fixing

[Monty Taylor (mordred)]

 - if (!(histfile_tmp= (char*) malloc(static_cast<uint32_t>(strlen(histfile) + 5))))

The internal one (static_cast<uint32_t> is not needed. strlen returns size_t which is the type malloc takes. However, (char *) can certainly be changed to use a c++ cast. (and don't even get me started on this needing to be a std::string instead of a malloc'd char *...

The other two are not - you do not need to const cast to _add_ const qualifiers, only to take them away.

[lp:~vjsamuel/drizzle/fix-casts-drizzle-client]

2196. By Vijay Samuel on 2011-02-23

Merge removed unnecessary const casts

Unmerged revisions

2196. By Vijay Samuel on 2011-02-23

Merge removed unnecessary const casts

2195. By Vijay Samuel on 2011-02-23

Merge C++ style casts for drizzle client

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2011-02-22 04:09:52 +0000
+++ client/drizzle.cc	2011-02-23 17:56:22 +0000
@@ -1576,7 +1576,7 @@
     /* Check that delimiter does not contain a backslash */
     if (! strstr(delimiter_str.c_str(), "\\"))
     {
-      delimiter= (char *)delimiter_str.c_str();  
+      delimiter= const_cast<char *>(delimiter_str.c_str());  
     }
     else
     {
@@ -1585,7 +1585,7 @@
       exit(-1);
     }
    
-    delimiter_length= (uint32_t)strlen(delimiter);
+    delimiter_length= static_cast<uint32_t>(strlen(delimiter));
   }
   if (vm.count("tee"))
   { 
@@ -1800,7 +1800,7 @@
   put_info(&output_buff[0], INFO_INFO, 0, 0);
 
 
-  initialize_readline((char *)current_prompt.c_str());
+  initialize_readline(const_cast<char *>(current_prompt.c_str()));
   if (!status.getBatch() && !quick)
   {
     /* read-history from file, default ~/.drizzle_history*/
@@ -1829,7 +1829,7 @@
       if (verbose)
         tee_fprintf(stdout, _("Reading history-file %s\n"),histfile);
       read_history(histfile);
-      if (!(histfile_tmp= (char*) malloc((uint32_t) strlen(histfile) + 5)))
+      if (!(histfile_tmp= (char*) malloc(strlen(histfile) + 5)))
       {
         fprintf(stderr, _("Couldn't allocate memory for temp histfile!\n"));
         exit(1);
@@ -1947,12 +1947,12 @@
   char *tmp, *pagpoint;
   
 
-  tmp= (char *) getenv("DRIZZLE_HOST");
+  tmp= const_cast<char *>(getenv("DRIZZLE_HOST"));
   if (tmp)
     current_host.assign(tmp);
 
   pagpoint= getenv("PAGER");
-  if (!((char*) (pagpoint)))
+  if (!(const_cast<char *>((pagpoint))))
   {
     pager.assign("stdout");
     opt_nopager= 1;
@@ -2102,14 +2102,14 @@
       return(NULL);
     if ((end=strcont(name," \t")))
     {
-      len=(uint32_t) (end - name);
+      len=static_cast<uint32_t>((end - name));
       while (isspace(*end))
         end++;
       if (!*end)
         end=0;          // no arguments to function
     }
     else
-      len=(uint32_t) strlen(name);
+      len=static_cast<uint32_t>(strlen(name));
   }
 
   for (uint32_t i= 0; commands[i].getName(); i++)
@@ -2139,7 +2139,7 @@
     return(0);
   if (status.getAddToHistory() && line[0] && not_in_history(line))
     add_history(line);
-  char *end_of_line=line+(uint32_t) strlen(line);
+  char *end_of_line= line + static_cast<uint32_t>(strlen(line));
 
   for (pos=out=line ; (inchar= (unsigned char) *pos) ; pos++)
   {
@@ -2388,7 +2388,7 @@
   if (out != line || (buffer->length() > 0))
   {
     *out++='\n';
-    uint32_t length=(uint32_t) (out-line);
+    uint32_t length= static_cast<uint32_t>((out-line));
     if ((buffer->length() + length) > opt_max_input_line)
     {
       status.setExitStatus(1);
@@ -2779,7 +2779,7 @@
   {
     end= strcpy(buff, commands[i].getName());
     end+= strlen(commands[i].getName());
-    for (j= (int)strlen(commands[i].getName()); j < 10; j++)
+    for (j= static_cast<int>(strlen(commands[i].getName())); j < 10; j++)
       end= strcpy(end, " ")+1;
     if (commands[i].func)
       tee_fprintf(stdout, "%s(\\%c) %s\n", buff,
@@ -3174,7 +3174,7 @@
     if (quick)
       length=max(length,drizzle_column_size(field));
     else
-      length=max(length,(uint32_t)drizzle_column_max_size(field));
+      length=max(length, static_cast<uint32_t>(drizzle_column_max_size(field)));
     if (length < 4 &&
         !(drizzle_column_flags(field) & DRIZZLE_COLUMN_FLAGS_NOT_NULL))
     {
@@ -3191,24 +3191,24 @@
     }
     drizzle_column_set_max_size(field, length);
 
-    for (x=0; x< (length+2); x++)
+    for (x= 0; x < (length+2); x++)
       separator.append("-");
     separator.append("+");
   }
 
-  tee_puts((char*) separator.c_str(), PAGER);
+  tee_puts(const_cast<char *>(separator.c_str()), PAGER);
   if (column_names)
   {
     drizzle_column_seek(result,0);
     (void) tee_fputs("|", PAGER);
     for (uint32_t off=0; (field = drizzle_column_next(result)) ; off++)
     {
-      uint32_t name_length= (uint32_t) strlen(drizzle_column_name(field));
+      uint32_t name_length= static_cast<uint32_t>(strlen(drizzle_column_name(field)));
       uint32_t numcells= drizzled::utf8::char_length(drizzle_column_name(field));
       uint32_t display_length= drizzle_column_max_size(field) + name_length -
                                numcells;
-      tee_fprintf(PAGER, " %-*s |",(int) min(display_length,
-                                             MAX_COLUMN_LENGTH),
+      tee_fprintf(PAGER, " %-*s |",static_cast<int>(min(display_length,
+                                             MAX_COLUMN_LENGTH)),
                   drizzle_column_name(field));
       num_flag[off]= ((drizzle_column_type(field) <= DRIZZLE_COLUMN_TYPE_LONGLONG) ||
                       (drizzle_column_type(field) == DRIZZLE_COLUMN_TYPE_NEWDECIMAL));
@@ -3232,7 +3232,7 @@
       }
     }
     (void) tee_fputs("\n", PAGER);
-    tee_puts((char*) separator.c_str(), PAGER);
+    tee_puts(const_cast<char *>(separator.c_str()), PAGER);
   }
 
   while (1)
@@ -3300,7 +3300,7 @@
       else
       {
         buffer= cur[off];
-        data_length= (uint32_t) lengths[off];
+        data_length= static_cast<uint32_t>(lengths[off]);
       }
 
       field= drizzle_column_next(result);
@@ -3359,7 +3359,7 @@
   if (quick)
     length= max(length, drizzle_column_size(field));
   else
-    length= max(length, (uint32_t)drizzle_column_max_size(field));
+    length= max(length, static_cast<uint32_t>(drizzle_column_max_size(field)));
 
   if (length < 4 &&
     !(drizzle_column_flags(field) & DRIZZLE_COLUMN_FLAGS_NOT_NULL))
@@ -3408,19 +3408,19 @@
 
   if (right_justified)
     for (i= data_length; i < total_bytes_to_send; i++)
-      tee_putc((int)' ', PAGER);
+      tee_putc(static_cast<int>(' '), PAGER);
 
   for (i= 0, p= data; i < data_length; i+= 1, p+= 1)
   {
     if (*p == '\0')
-      tee_putc((int)' ', PAGER);
+      tee_putc(static_cast<int>(' '), PAGER);
     else
-      tee_putc((int)*p, PAGER);
+      tee_putc(static_cast<int>(*p), PAGER);
   }
 
   if (! right_justified)
     for (i= data_length; i < total_bytes_to_send; i++)
-      tee_putc((int)' ', PAGER);
+      tee_putc(static_cast<int>(' '), PAGER);
 }
 
 
@@ -3463,8 +3463,8 @@
     for (uint32_t off=0; off < drizzle_result_column_count(result); off++)
     {
       field= drizzle_column_next(result);
-      tee_fprintf(PAGER, "%*s: ",(int) max_length,drizzle_column_name(field));
-      tee_fprintf(PAGER, "%s\n",cur[off] ? (char*) cur[off] : "NULL");
+      tee_fprintf(PAGER, "%*s: ",static_cast<int>(max_length) ,drizzle_column_name(field));
+      tee_fprintf(PAGER, "%s\n",cur[off] ? const_cast<char *>(cur[off]) : "NULL");
     }
     if (quick)
       drizzle_row_free(result, cur);
@@ -3501,7 +3501,7 @@
     warning.
   */
   if (!cur || (num_rows == 1 &&
-      error_code == (uint32_t) strtoul(cur[1], NULL, 10)))
+      error_code == static_cast<uint32_t>(strtoul(cur[1], NULL, 10))))
   {
     goto end;
   }
@@ -3955,7 +3955,7 @@
     }
   }
   strncpy(delimiter, tmp, sizeof(delimiter) - 1);
-  delimiter_length= (int)strlen(delimiter);
+  delimiter_length= static_cast<int>(strlen(delimiter));
   delimiter_str= delimiter;
   return 0;
 }
@@ -4180,9 +4180,9 @@
   drizzle_con_options_t options= (drizzle_con_options_t) (use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL);
 #endif
 
-  if (drizzle_con_add_tcp(&drizzle, &con, (char *)host.c_str(),
-    opt_drizzle_port, (char *)user.c_str(),
-    (char *)password.c_str(), (char *)database.c_str(),
+  if (drizzle_con_add_tcp(&drizzle, &con, const_cast<char *>(host.c_str()),
+    opt_drizzle_port, const_cast<char *>(user.c_str()),
+    const_cast<char *>(password.c_str()), const_cast<char *>(database.c_str()),
     options) == NULL)
   {
     (void) put_error(&con, NULL);
@@ -4781,14 +4781,14 @@
 
 static const char * strcont(const char *str, const char *set)
 {
-  const char * start = (const char *) set;
+  const char * start= set;
 
   while (*str)
   {
     while (*set)
     {
       if (*set++ == *str)
-        return ((const char*) str);
+        return (str);
     }
     set=start; str++;
   }