[libgda] Fixed make check



commit afa7e5f6a31dd2fe691adb98001254e4ab291e6c
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Apr 21 10:26:43 2016 -0500

    Fixed make check
    
    * Even if this work have passed all tests, may we need to search for
      memory leaks.

 tests/test-bin-converter.c |   22 ++++++++++++----------
 tests/test-sql-builder.c   |    6 ++++--
 2 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/tests/test-bin-converter.c b/tests/test-bin-converter.c
index 6ff1f91..cc264ca 100644
--- a/tests/test-bin-converter.c
+++ b/tests/test-bin-converter.c
@@ -23,7 +23,7 @@ int
 main (int argc, char** argv)
 {
        gchar *file;
-       GdaBinary bin;
+       GdaBinary* bin;
        gchar *bin_data;
        gsize bin_length;
        GError *error = NULL;
@@ -35,35 +35,37 @@ main (int argc, char** argv)
                return EXIT_FAILURE;
        }               
        g_free (file);
-       bin.data = (guchar*) bin_data;
-       bin.binary_length = bin_length;
+       bin = gda_binary_new ();
+       gda_binary_set_data (bin, (guchar*) bin_data, bin_length);
 
        /* convert to string */
        gchar *conv1;
-       conv1 = gda_binary_to_string (&bin, 0);
+       conv1 = gda_binary_to_string (bin, 0);
        
        /* convert back to binary */
        GdaBinary *bin2;
        bin2 = gda_string_to_binary (conv1);
        
        /* compare bin */
-       if (bin.binary_length != bin2->binary_length) {
+       if (gda_binary_get_size (bin) != gda_binary_get_size (bin2)) {
                g_print ("Error: binary length differ: from %ld to %ld\n",
-                        bin.binary_length, bin2->binary_length);
+                        gda_binary_get_size (bin), gda_binary_get_size (bin2));
                return EXIT_FAILURE;
        }
        gint i;
-       for (i = 0; i < bin.binary_length; i++) {
-               if (bin.data[i] != bin2->data[i]) {
+       for (i = 0; i < gda_binary_get_size (bin); i++) {
+         guchar *buffer = gda_binary_get_data (bin);
+         guchar *buffer2 = gda_binary_get_data (bin2);
+               if (buffer[i] != buffer2[i]) {
                        g_print ("Error: binary differ orig[%d]=%d and copy[%d]=%d\n",
-                                i, bin.data[i], i, bin2->data[i]);
+                                i, buffer[i], i, buffer2[i]);
                        return EXIT_FAILURE;
                }
        }
        
        g_free (conv1);
+       gda_binary_free (bin);
        gda_binary_free (bin2);
-       g_free (bin_data);
 
        g_print ("Ok (file size: %d)\n", bin_length);
        return EXIT_SUCCESS;
diff --git a/tests/test-sql-builder.c b/tests/test-sql-builder.c
index 6a1afdc..ff022fb 100644
--- a/tests/test-sql-builder.c
+++ b/tests/test-sql-builder.c
@@ -629,9 +629,11 @@ build13 (void)
                                            gda_sql_builder_add_expr (b, NULL, G_TYPE_DATE, date), 0);
        g_date_free (date);
 
-       GdaBinary bin = {"abc'de\\fghijklm", 10};
+       gchar *data = "abc'de\\fghijklm";
+       GdaBinary *bin = gda_binary_new ();
+       gda_binary_set_data (bin, data, 10);
        gda_sql_builder_add_field_value_id (b,
-                                           gda_sql_builder_add_expr (b, NULL, GDA_TYPE_BINARY, &bin), 0);
+                                           gda_sql_builder_add_expr (b, NULL, GDA_TYPE_BINARY, bin), 0);
 
 
 #ifdef DEBUG


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]