Merge lp:~brianaker/libdrizzle/cleanup-api into lp:libdrizzle

[Brian Aker]

[lp:~brianaker/libdrizzle/cleanup-api]

99. By Drizzle Continuous Integration on 2013-01-27

Merge lp:~brianaker/libdrizzle/cleanup-api Build: jenkins-Libdrizzle-55

=== modified file 'libdrizzle-5.1/conn.h'
--- libdrizzle-5.1/conn.h	2013-01-27 00:09:17 +0000
+++ libdrizzle-5.1/conn.h	2013-01-27 01:59:21 +0000
@@ -105,16 +105,6 @@
 const char *drizzle_error(const drizzle_st *con);
 
 /**
- * Value of errno in the case of a DRIZZLE_RETURN_ERRNO return value.
- *
- * @param[in] con Connection structure previously initialized with
- *  drizzle_create(), drizzle_clone(), or related functions.
- * @return An errno value as defined in your system errno.h file.
- */
-DRIZZLE_API
-int drizzle_errno(const drizzle_st *con);
-
-/**
  * Get server defined error code for the last result read.
  *
  * @param[in] con Connection structure previously initialized with

=== modified file 'libdrizzle-5.1/query.h'
--- libdrizzle-5.1/query.h	2013-01-10 22:14:47 +0000
+++ libdrizzle-5.1/query.h	2013-01-27 01:59:21 +0000
@@ -79,13 +79,7 @@
  */
 
 DRIZZLE_API
-ssize_t drizzle_escape_string(char *to, const size_t max_to_size, const char *from, const size_t from_size);
-
-DRIZZLE_API
-bool drizzle_hex_string(char *to, const unsigned char *from, const size_t from_size);
-
-DRIZZLE_API
-bool drizzle_mysql_password_hash(char *to, const char *from, const size_t from_size);
+ssize_t drizzle_escape_string(drizzle_st *con, char **to, const char *from, const size_t from_size);
 
 /** @} */
 

=== modified file 'libdrizzle/conn.cc'
--- libdrizzle/conn.cc	2013-01-26 23:31:43 +0000
+++ libdrizzle/conn.cc	2013-01-27 01:59:21 +0000
@@ -270,16 +270,6 @@
   return (const char *)con->last_error;
 }
 
-int drizzle_errno(const drizzle_st *con)
-{
-  if (con == NULL)
-  {
-    return 0;
-  }
-
-  return con->last_errno;
-}
-
 uint16_t drizzle_error_code(const drizzle_st *con)
 {
   if (con == NULL)

=== modified file 'libdrizzle/drizzle_local.h'
--- libdrizzle/drizzle_local.h	2013-01-26 23:44:28 +0000
+++ libdrizzle/drizzle_local.h	2013-01-27 01:59:21 +0000
@@ -115,6 +115,11 @@
   }
 }
 
+bool drizzle_hex_string(char *to, const unsigned char *from, const size_t from_size);
+
+bool drizzle_mysql_password_hash(char *to, const char *from, const size_t from_size);
+
+
 /**
  * Log an error message, see drizzle_log() for argument details.
  */

=== modified file 'libdrizzle/query.cc'
--- libdrizzle/query.cc	2013-01-10 22:14:47 +0000
+++ libdrizzle/query.cc	2013-01-27 01:59:21 +0000
@@ -56,14 +56,26 @@
                                    (unsigned char *)query, size, size, ret_ptr);
 }
 
-ssize_t drizzle_escape_string(char *to, const size_t max_to_size, const char *from, const size_t from_size)
+ssize_t drizzle_escape_string(drizzle_st *con, char **destination, const char *from, const size_t from_size)
 {
+  (void)con;
   const char *end;
 
-  if (to == NULL || max_to_size == 0 || from == NULL || from_size == 0)
-  {
-    return -1;
-  }
+  if (from == NULL || from_size == 0)
+  {
+    return -1;
+  }
+
+  size_t max_to_size= from_size * 2;
+  *destination= (char*) malloc(max_to_size);
+
+  if (destination == NULL)
+  {
+    return -1;
+  }
+
+  char *to= *destination;
+
 
   ssize_t to_size= 0;
   char newchar;
@@ -104,7 +116,11 @@
     if (newchar != '\0')
     {
       if ((size_t)to_size + 2 > max_to_size)
+      {
+        free(to);
+        *destination= NULL;
         return -1;
+      }
 
       *to++= '\\';
       *to++= newchar;
@@ -113,7 +129,11 @@
     else
     {
       if ((size_t)to_size + 1 > max_to_size)
+      {
+        free(to);
+        *destination= NULL;
         return -1;
+      }
 
       *to++= *from;
     }

=== modified file 'tests/unit/escape.c'
--- tests/unit/escape.c	2013-01-12 10:59:06 +0000
+++ tests/unit/escape.c	2013-01-27 01:59:21 +0000
@@ -46,19 +46,22 @@
 int main(int argc, char* argv[])
 {
   const char* in= "escape \"this\"\n";
-  char out[255];
-  int out_len;
 
   (void) argc;
   (void) argv;
 
   // Test for data too long
-  out_len= drizzle_escape_string(out, 2, in, strlen(in));
-  ASSERT_EQ(out_len, -1);
-
-  out_len= drizzle_escape_string(out, 255, in, strlen(in));
-  ASSERT_EQ_(out_len, 17, "Bad hex length output %d", out_len);
-  ASSERT_EQ_(strcmp(out, "escape \\\"this\\\"\\n"), 0, "Bad hex data output");
+  char *out;
+  uint64_t out_len= drizzle_escape_string(NULL, &out, in, strlen(in));
+  ASSERT_EQ_(17, out_len, "drizzle_escape_string(): %u != %u", 17, (unsigned int)(out_len));
+
+  free(out);
+
+  out_len= drizzle_escape_string(NULL, &out, in, strlen(in));
+  ASSERT_EQ_(out_len, 17, "Bad hex length output %u", (unsigned int)(out_len));
+  ASSERT_EQ_(0, strcmp(out, "escape \\\"this\\\"\\n"), "Bad hex data output");
+
+  free(out);
 
   return EXIT_SUCCESS;
 }

=== removed file 'tests/unit/hex.c'
--- tests/unit/hex.c	2013-01-12 10:59:06 +0000
+++ tests/unit/hex.c	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * Drizzle Client & Protocol Library
- *
- * Copyright (C) 2012 Drizzle Developer Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- *     * The names of its contributors may not be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <yatl/lite.h>
-
-#include <libdrizzle-5.1/libdrizzle.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-int main(int argc, char* argv[])
-{
-  const unsigned char in[6]= {0x00, 0xFF, 0x7F, 0x80, 0xB9, 0xC0};
-  char out[255];
-  bool result;
-
-  (void) argc;
-  (void) argv;
-
-  // Test for bad usage
-  result= drizzle_hex_string(out, in, 0);
-  ASSERT_EQ_(false, result, "Bad usage of drizzle_hex_string()");
-
-  result= drizzle_hex_string(out, in, sizeof(in));
-  ASSERT_EQ_(true, result, "Failed to get result");
-
-  ASSERT_STREQ_("00FF7F80B9C0", out, "Bad result data from drizzle_hex_string()");
-
-  return EXIT_SUCCESS;
-}

=== modified file 'tests/unit/include.am'
--- tests/unit/include.am	2013-01-26 23:44:28 +0000
+++ tests/unit/include.am	2013-01-27 01:59:21 +0000
@@ -82,16 +82,6 @@
 check_PROGRAMS+= tests/unit/connect_uds
 noinst_PROGRAMS+= tests/unit/connect_uds
 
-tests_unit_hex_SOURCES= tests/unit/hex.c
-tests_unit_hex_LDADD= libdrizzle/libdrizzle.la
-check_PROGRAMS+= tests/unit/hex
-noinst_PROGRAMS+= tests/unit/hex
-
-tests_unit_passwd_SOURCES= tests/unit/passwd.c
-tests_unit_passwd_LDADD= libdrizzle/libdrizzle.la
-check_PROGRAMS+= tests/unit/passwd
-noinst_PROGRAMS+= tests/unit/passwd
-
 tests_unit_unbuffered_query_SOURCES= tests/unit/unbuffered_query.c
 tests_unit_unbuffered_query_LDADD= libdrizzle/libdrizzle.la
 check_PROGRAMS+= tests/unit/unbuffered_query

=== removed file 'tests/unit/passwd.c'
--- tests/unit/passwd.c	2013-01-12 10:59:06 +0000
+++ tests/unit/passwd.c	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * Drizzle Client & Protocol Library
- *
- * Copyright (C) 2012 Drizzle Developer Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- *     * The names of its contributors may not be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <yatl/lite.h>
-
-#include <libdrizzle-5.1/libdrizzle.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-int main(int argc, char* argv[])
-{
-  const char* in= "a nice passphrase";
-  char out[255];
-  bool result;
-
-  (void) argc;
-  (void) argv;
-
-  // Test for bad usage
-  result= drizzle_mysql_password_hash(out, in, 0);
-  if (result)
-  {
-    printf("Usage test failure\n");
-    return EXIT_FAILURE;
-  }
-
-  result= drizzle_mysql_password_hash(out, in, strlen(in));
-  if (!result)
-  {
-    printf("Didn't get a result failure\n");
-    return EXIT_FAILURE;
-  }
-
-  if (strcmp(out, "597B78D6E0366308739CEBB0E221B246F117E111") != 0)
-  {
-    printf("Password output didn't match\n");
-    return EXIT_FAILURE;
-  }
-  return EXIT_SUCCESS;
-}

=== modified file 'tests/unit/statement_char.c'
--- tests/unit/statement_char.c	2013-01-12 13:40:18 +0000
+++ tests/unit/statement_char.c	2013-01-27 01:59:21 +0000
@@ -139,11 +139,7 @@
     return EXIT_FAILURE;
   }
   ret = drizzle_stmt_close(stmt);
-  if (ret != DRIZZLE_RETURN_OK)
-  {
-    printf("Statement close failure ret: %d, err: %d, msg: %s\n", ret, drizzle_errno(con), drizzle_error(con));
-    return EXIT_FAILURE;
-  }
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_stmt_close() %s", drizzle_error(con));
 
   drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");