implementing prepare data postgres functions for #4141

2 files changed, 15 insertions, 19 deletions

diff --git a/src/include/taler_mintdb_plugin.h b/src/include/taler_mintdb_plugin.h
index 1d40f2935..7c48114b8 100644
--- a/src/include/taler_mintdb_plugin.h
+++ b/src/include/taler_mintdb_plugin.h
@@ -1383,7 +1383,7 @@ struct TALER_MINTDB_Plugin
    *
    * @param cls closure
    * @param session database connection
-   * @param type type fo the wire transfer (i.e. "sepa")
+   * @param type type of the wire transfer (i.e. "sepa")
    * @param buf buffer with wire transfer preparation data
    * @param buf_size number of bytes in @a buf
    * @return #GNUNET_OK on success, #GNUNET_SYSERR on DB errors
@@ -1401,21 +1401,17 @@ struct TALER_MINTDB_Plugin
    *
    * @param cls closure
    * @param session database connection
-   * @param type type fo the wire transfer (i.e. "sepa")
-   * @param buf buffer with wire transfer preparation data
-   * @param buf_size number of bytes in @a buf
+   * @param rowid which entry to mark as finished
    * @return #GNUNET_OK on success, #GNUNET_SYSERR on DB errors
    */
   int
   (*wire_prepare_data_mark_finished)(void *cls,
                                      struct TALER_MINTDB_Session *session,
-                                     const char *type,
-                                     const char *buf,
-                                     size_t buf_size);
+                                     unsigned long long rowid);
 
 
   /**
-   * Function called to iterate over unfinished wire transfer
+   * Function called to get an unfinished wire transfer
    * preparation data. Fetches at most one item.
    *
    * @param cls closure
@@ -1428,11 +1424,11 @@ struct TALER_MINTDB_Plugin
    *         #GNUNET_SYSERR on DB errors
    */
   int
-  (*wire_prepare_data_iterate)(void *cls,
-                               struct TALER_MINTDB_Session *session,
-                               const char *type,
-                               TALER_MINTDB_WirePreparationCallback cb,
-                               void *cb_cls);
+  (*wire_prepare_data_get)(void *cls,
+                           struct TALER_MINTDB_Session *session,
+                           const char *type,
+                           TALER_MINTDB_WirePreparationCallback cb,
+                           void *cb_cls);
 
 
 };
diff --git a/src/include/taler_pq_lib.h b/src/include/taler_pq_lib.h
index e0ca429e1..c9a9ebdc5 100644
--- a/src/include/taler_pq_lib.h
+++ b/src/include/taler_pq_lib.h
@@ -156,7 +156,7 @@ struct TALER_PQ_QueryParam
  * @param x pointer to the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_query_param_amount_nbo(const struct TALER_AmountNBO *x);
+TALER_PQ_query_param_amount_nbo (const struct TALER_AmountNBO *x);
 
 
 /**
@@ -168,7 +168,7 @@ TALER_PQ_query_param_amount_nbo(const struct TALER_AmountNBO *x);
  * @param x pointer to the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_query_param_amount(const struct TALER_Amount *x);
+TALER_PQ_query_param_amount (const struct TALER_Amount *x);
 
 
 /**
@@ -178,7 +178,7 @@ TALER_PQ_query_param_amount(const struct TALER_Amount *x);
  * @param x the query parameter to pass.
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_query_param_rsa_public_key(const struct GNUNET_CRYPTO_rsa_PublicKey *x);
+TALER_PQ_query_param_rsa_public_key (const struct GNUNET_CRYPTO_rsa_PublicKey *x);
 
 
 /**
@@ -188,7 +188,7 @@ TALER_PQ_query_param_rsa_public_key(const struct GNUNET_CRYPTO_rsa_PublicKey *x)
  * @param x the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_query_param_rsa_signature(const struct GNUNET_CRYPTO_rsa_Signature *x);
+TALER_PQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_rsa_Signature *x);
 
 
 /**
@@ -198,7 +198,7 @@ TALER_PQ_query_param_rsa_signature(const struct GNUNET_CRYPTO_rsa_Signature *x);
  * @param x pointer to the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x);
+TALER_PQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x);
 
 
 /**
@@ -208,7 +208,7 @@ TALER_PQ_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x);
  * @param x pointer to the query parameter to pass
  */
 struct TALER_PQ_QueryParam
-TALER_PQ_query_param_absolute_time_nbo(const struct GNUNET_TIME_AbsoluteNBO *x);
+TALER_PQ_query_param_absolute_time_nbo (const struct GNUNET_TIME_AbsoluteNBO *x);
 
 
 /**