Merge lp:~dshrews/libdrizzle/libdrizzle into lp:libdrizzle

[Andrew Hutchings]

Shrew's clang fixes

=== modified file 'libdrizzle/command.cc'
--- libdrizzle/command.cc	2013-01-27 11:55:48 +0000
+++ libdrizzle/command.cc	2013-04-26 19:03:38 +0000
@@ -85,11 +85,12 @@
     /* Make sure we can fit the largest non-streaming packet, currently a
        DRIZZLE_COMMAND_CHANGE_USER command. */
 
-    con->packet_size= 1  /* Command */
+    con->packet_size= (uint32_t)(
+                      1  /* Command */
                     + strlen(con->user) + 1
                     + 1  /* Scramble size */
                     + DRIZZLE_MAX_SCRAMBLE_SIZE
-                    + strlen(con->db) + 1;
+                    + strlen(con->db) + 1);
 
     /* Flush buffer if there is not enough room. */
     free_size= con->buffer_allocation - (size_t)(start - con->buffer);
@@ -121,7 +122,7 @@
     }
     else
     {
-      con->packet_size= 1 + con->command_total;
+      con->packet_size= (uint32_t)(1 + con->command_total);
       free_size-= 5;
 
       /* Copy as much of the data in as we can into the write buffer. */
 
=== modified file 'libdrizzle/drizzle.cc'
--- libdrizzle/drizzle.cc	2013-01-27 14:00:17 +0000
+++ libdrizzle/drizzle.cc	2013-04-26 19:03:38 +0000
@@ -364,6 +364,7 @@
  * Local Definitions
  */
 
+__attribute__((__format__ (__printf__, 3, 4)))
 void drizzle_set_error(drizzle_st *con, const char *function,
                        const char *format, ...)
 {
@@ -413,6 +414,7 @@
   }
 }
 
+__attribute__((__format__ (__printf__, 3, 0)))
 void drizzle_log(drizzle_st *con, drizzle_verbose_t verbose,
                  const char *format, va_list args)
 {
 
=== modified file 'libdrizzle/field.cc'
--- libdrizzle/field.cc	2013-04-25 09:02:57 +0000
+++ libdrizzle/field.cc	2013-04-26 19:03:38 +0000
@@ -307,7 +307,7 @@
         con->result->field_total)
     {
       con->result->column_buffer[con->result->field_current].size=
-                                                       con->result->field_total;
+                                             (uint32_t)con->result->field_total;
     }
 
     con->result->field_current++;
@@ -388,7 +388,7 @@
     case DRIZZLE_COLUMN_TYPE_DECIMAL:
     case DRIZZLE_COLUMN_TYPE_NEWDECIMAL:
     case DRIZZLE_COLUMN_TYPE_NEWDATE:
-      con->result->field_size= (size_t)drizzle_unpack_length(con, &ret);
+      con->result->field_size= (uint32_t)drizzle_unpack_length(con, &ret);
       if (ret != DRIZZLE_RETURN_OK)
       {
         return ret;
 
=== modified file 'libdrizzle/handshake.cc'
--- libdrizzle/handshake.cc	2013-02-28 02:19:33 +0000
+++ libdrizzle/handshake.cc	2013-04-26 19:03:38 +0000
@@ -228,7 +228,8 @@
   drizzle_log_debug(con, "drizzle_state_handshake_server_write");
 
   /* Calculate max packet size. */
-  con->packet_size= 1   /* Protocol version */
+  con->packet_size= (uint32_t)(
+                    1   /* Protocol version */
                   + strlen(con->server_version) + 1
                   + 4   /* Thread ID */
                   + 8   /* Scramble */
@@ -238,7 +239,7 @@
                   + 2   /* Status */
                   + 13  /* Unused */
                   + 12  /* Scramble */
-                  + 1;  /* NULL */
+                  + 1);  /* NULL */
 
   /* Assume the entire handshake packet will fit in the buffer. */
   if ((con->packet_size + 4) > con->buffer_allocation)
@@ -541,14 +542,15 @@
   }
 #endif
   /* Calculate max packet size. */
-  con->packet_size= 4   /* Capabilities */
+  con->packet_size= (uint32_t)(
+                    4   /* Capabilities */
                   + 4   /* Max packet size */
                   + 1   /* Charset */
                   + 23  /* Unused */
                   + strlen(con->user) + 1
                   + 1   /* Scramble size */
                   + DRIZZLE_MAX_SCRAMBLE_SIZE
-                  + strlen(con->db) + 1;
+                  + strlen(con->db) + 1);
 
   /* Assume the entire handshake packet will fit in the buffer. */
   if ((con->packet_size + 4) > con->buffer_allocation)