GNUNET extract result libgnunetmy

diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h
index b63ee9218fb8b993961a9753915e4147e8bf6875..9a26022c837e4b63548973bfcec44edc3368a06c 100644 (file)
--- a/src/include/gnunet_my_lib.h
+++ b/src/include/gnunet_my_lib.h
@@ -95,7 +95,7 @@ struct GNUNET_MY_QueryParam
   /**
    * Information to pass to @e conv.  Size of @a data.
    */
-  unsigned long data_len;
+  unsigned long data_len ;
 
 };
 
@@ -222,13 +222,12 @@ GNUNET_MY_result_spec_fixed_size (void *ptr,
  */
 #define GNUNET_MY_result_spec_auto_from_type(dst) GNUNET_MY_result_spec_fixed_size ((dst), sizeof (*(dst)))
 
-
 /**
  * FIXME.
+ *
  */
 int
-GNUNET_MY_extract_result (struct GNUNET_MYSQL_Context *mc,
-                          struct GNUNET_MYSQL_StatementHandle *stmt,
+GNUNET_MY_extract_result (MYSQL_BIND * result,
                           int row,
                           struct GNUNET_MY_ResultSpec *specs);
 

diff --git a/src/my/my.c b/src/my/my.c
index 62b1ede0988d440a1713421d8b0855135a1ce3f9..71d30dd162766db815b03f9e3cd55b3d0404ac7d 100644 (file)
--- a/src/my/my.c
+++ b/src/my/my.c
@@ -90,5 +90,49 @@ GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc,
   return GNUNET_OK;
 }
 
+/**
+  * Extract results from a query result according 
+  * to the given specification. If colums are NULL,
+  * the destination is not modified, and #GNUNET_NO is returned
+  * 
+  *
+  * @param result 
+  * @param row, the row from the result to extract
+  * @param result specificatio to extract for
+  * @return 
+    #GNUNET_YES if all results could be extracted
+    #GNUNET_NO if at least one result was NULL
+    #GNUNET_SYSERR if a result was invalid
+*/
+int
+GNUNET_MY_extract_result (MYSQL_BIND * result,
+                          int row,
+                          struct GNUNET_MY_ResultSpec *specs)
+{
+  unsigned int i ;
+  int had_null = GNUNET_NO ;
+  int ret ;
+
+  for(i = 0 ; NULL != specs[i].conv ; i++) 
+  {
+    struct GNUNET_MY_ResultSpec * spec ;
+
+    spec = &specs[i] ;
+    ret = spec->conv(spec->conv_cls,
+                    NULL, //wait GNUNET_MY_QueryParam
+                    result);
+    
+    if(ret == GNUNET_SYSERR)
+      return GNUNET_SYSERR ;
+
+    if(spec->result_size != NULL)
+      *spec->result_size = spec->dst_size;
+  }
+  
+  if(GNUNET_YES == had_null)
+    return GNUNET_NO ;
+
+  return GNUNET_OK ;
+}
 
 /* end of my.c */