[Caml-list] Re: Is this C-binding correct?

[Matthieu Dubuget <matthieu.dubuget@gmail.com>]

Matthieu Dubuget a écrit :
> Thanks for your advices
>

This second try, using another function seems safer to me. But… is it?

#include "mdbtools.h"

#include <caml/mlvalues.h>
#include <caml/alloc.h>
#include <caml/memory.h>


value add_line(value datas,  MdbHandle *mdb, MdbTableDef *table, char 
**bound_values){
   CAMLparam1(datas);
   CAMLlocal2(my_line,new_datas);
   int i;
   MdbColumn *col;
   char *va;
   size_t length;

     /* Allocation d’un tableau */
     my_line = caml_alloc(table->num_cols, 0);

     for (i=0; i<table->num_cols; i++){
       col = g_ptr_array_index(table->columns, i);
       if (col->col_type == MDB_OLE)
     va = mdb_ole_read_full(mdb, col, &length);
       else
     va = bound_values[i];

       Store_field(my_line, i, caml_copy_string(va));

       if (col->col_type == MDB_OLE)
     free(va);
     }

     new_datas = caml_alloc(2,0);
     Store_field(new_datas, 0, my_line);
     Store_field(new_datas, 1, datas);
     CAMLreturn(new_datas);
}


  __declspec(dllexport) value mdb_extract(value base, value tbl){
   CAMLparam2(base, tbl);
   CAMLlocal3(datas, new_datas, my_line);
   MdbHandle *mdb;
   MdbTableDef *table;
   char **bound_values;
   int *bound_lens;
   char *va;
   int i;

   mdb = mdb_open(String_val(base), MDB_NOFLAGS);
   table = mdb_read_table_by_name(mdb, String_val(tbl), MDB_TABLE);
   mdb_read_columns(table);
   mdb_rewind_table(table);
   bound_values = (char **) g_malloc(table->num_cols * sizeof(char *));
   bound_lens = (int *) g_malloc(table->num_cols * sizeof(int));
   for (i=0;i<table->num_cols;i++){
     bound_values[i] = (char *)g_malloc0(MDB_BIND_SIZE);
     mdb_bind_column(table, i+1, bound_values[i], &bound_lens[i]);
   };
   /* Liste vide */
   datas = Val_int(0);
   while (mdb_fetch_row(table))
     datas = add_line(datas, mdb, table, bound_values);
   for (i=0;i<table->num_cols;i++)
     g_free(bound_values[i]);
   g_free(bound_values);
   g_free(bound_lens);
   mdb_free_tabledef(table);
   mdb_close(mdb);
   CAMLreturn(datas);
}