[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: -typos
|
From: |
gnunet |
|
Subject: |
[taler-merchant] branch master updated: -typos |
|
Date: |
Mon, 21 Nov 2022 14:44:20 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 0c46527c -typos
new 01939fd2 Merge branch 'master' of git+ssh://git.taler.net/merchant
0c46527c is described below
commit 0c46527c2b83311f4d2758379f901f367de42ca5
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Nov 21 14:44:13 2022 +0100
-typos
---
src/backenddb/merchant-0004.sql | 9 +++--
src/backenddb/plugin_merchantdb_postgres.c | 50 +++++++++++++-------------
src/include/taler_merchantdb_plugin.h | 56 ++++++++++++++----------------
3 files changed, 55 insertions(+), 60 deletions(-)
diff --git a/src/backenddb/merchant-0004.sql b/src/backenddb/merchant-0004.sql
index 4a91911d..0e8428ca 100644
--- a/src/backenddb/merchant-0004.sql
+++ b/src/backenddb/merchant-0004.sql
@@ -15,11 +15,10 @@
--
-/**
- * @file merchant-004.sql
- * @brief database helper functions for postgres used by the merchant and
funtion for plugin_merchantdb_postgres.c
- * @author Priscilla Huang
- */
+-- @file merchant-0004.sql
+-- @brief database helper functions for postgres used by the merchant and
function for plugin_merchantdb_postgres.c
+-- @author Priscilla Huang
+
BEGIN;
-- Check patch versioning is in place.
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index 692d7912..41cd8154 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -1298,6 +1298,7 @@ lookup_products_cb (void *cls,
}
}
+
/**
* Lookup all of the products the given instance has configured.
*
@@ -1339,7 +1340,6 @@ postgres_lookup_products (void *cls,
}
-
/**
* Lookup details about a particular product.
*
@@ -6815,7 +6815,6 @@ postgres_insert_pickup_blind_signature (
}
-
/**
* Delete information about a template.
*
@@ -6823,12 +6822,12 @@ postgres_insert_pickup_blind_signature (
* @param instance_id instance to delete template of
* @param template_id template to delete
* @return DB status code, #GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
- * if template unknow.
+ * if template unknown.
*/
static enum GNUNET_DB_QueryStatus
postgres_delete_template (void *cls,
- const char *instance_id,
- const char *template_id)
+ const char *instance_id,
+ const char *template_id)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -6843,6 +6842,7 @@ postgres_delete_template (void *cls,
params);
}
+
/**
* Insert details about a particular template.
*
@@ -6854,9 +6854,9 @@ postgres_delete_template (void *cls,
*/
static enum GNUNET_DB_QueryStatus
postgres_insert_template (void *cls,
- const char *instance_id,
- const char *template_id,
- const struct TALER_MERCHANTDB_TemplateDetails *pd)
+ const char *instance_id,
+ const char *template_id,
+ const struct TALER_MERCHANTDB_TemplateDetails *pd)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -6875,6 +6875,7 @@ postgres_insert_template (void *cls,
params);
}
+
/**
* Update details about a particular template.
*
@@ -6888,9 +6889,9 @@ postgres_insert_template (void *cls,
*/
static enum GNUNET_DB_QueryStatus
postgres_update_template (void *cls,
- const char *instance_id,
- const char *template_id,
- const struct TALER_MERCHANTDB_TemplateDetails *pd)
+ const char *instance_id,
+ const char *template_id,
+ const struct TALER_MERCHANTDB_TemplateDetails *pd)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -6910,8 +6911,6 @@ postgres_update_template (void *cls,
}
-
-
/**
* Context used for postgres_lookup_template().
*/
@@ -6944,8 +6943,8 @@ struct LookupTemplateContext
*/
static void
lookup_templates_cb (void *cls,
- PGresult *result,
- unsigned int num_results)
+ PGresult *result,
+ unsigned int num_results)
{
struct LookupTemplateContext *tlc = cls;
@@ -6957,7 +6956,7 @@ lookup_templates_cb (void *cls,
GNUNET_PQ_result_spec_string ("template_id",
&template_id),
GNUNET_PQ_result_spec_string ("template_description",
- &template_description),
+ &template_description),
GNUNET_PQ_result_spec_end
};
@@ -6989,9 +6988,9 @@ lookup_templates_cb (void *cls,
*/
static enum GNUNET_DB_QueryStatus
postgres_lookup_templates (void *cls,
- const char *instance_id,
- TALER_MERCHANTDB_TemplatesCallback cb,
- void *cb_cls)
+ const char *instance_id,
+ TALER_MERCHANTDB_TemplatesCallback cb,
+ void *cb_cls)
{
struct PostgresClosure *pg = cls;
struct LookupTemplateContext tlc = {
@@ -7018,6 +7017,7 @@ postgres_lookup_templates (void *cls,
return qs;
}
+
/**
* Lookup details about a particular template.
*
@@ -7030,9 +7030,9 @@ postgres_lookup_templates (void *cls,
*/
static enum GNUNET_DB_QueryStatus
postgres_lookup_template (void *cls,
- const char *instance_id,
- const char *template_id,
- struct TALER_MERCHANTDB_TemplateDetails *pd)
+ const char *instance_id,
+ const char *template_id,
+ struct TALER_MERCHANTDB_TemplateDetails *pd)
{
struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = {
@@ -7061,7 +7061,7 @@ postgres_lookup_template (void *cls,
GNUNET_PQ_result_spec_string ("image",
&pd->image),
TALER_PQ_result_spec_json ("template_contract",
- &pd->template_contract),
+ &pd->template_contract),
GNUNET_PQ_result_spec_end
};
@@ -7074,8 +7074,6 @@ postgres_lookup_template (void *cls,
}
-
-
/**
* Establish connection to the database.
*
@@ -9590,7 +9588,7 @@ postgres_connect (void *cls)
if (NULL == pg->conn)
return GNUNET_SYSERR;
return GNUNET_OK;
- };
+};
/**
diff --git a/src/include/taler_merchantdb_plugin.h
b/src/include/taler_merchantdb_plugin.h
index fb0b9e53..51c5ec02 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -309,8 +309,8 @@ struct TALER_MERCHANTDB_ProductDetails
*/
typedef void
(*TALER_MERCHANTDB_TemplatesCallback)(void *cls,
- const char *template_id,
- const char *template_description);
+ const char *template_id,
+ const char *template_description);
/**
@@ -2428,11 +2428,11 @@ struct TALER_MERCHANTDB_Plugin
* @param cb_cls closure for @a cb
* @return database result code
*/
-enum GNUNET_DB_QueryStatus
-(*lookup_templates) (void *cls,
- const char *instance_id,
- TALER_MERCHANTDB_TemplatesCallback cb,
- void *cb_cls);
+ enum GNUNET_DB_QueryStatus
+ (*lookup_templates)(void *cls,
+ const char *instance_id,
+ TALER_MERCHANTDB_TemplatesCallback cb,
+ void *cb_cls);
/**
@@ -2445,11 +2445,11 @@ enum GNUNET_DB_QueryStatus
* (in that case we only want to check if the template exists)
* @return database result code
*/
-enum GNUNET_DB_QueryStatus
-(*lookup_template) (void *cls,
- const char *instance_id,
- const char *template_id,
- struct TALER_MERCHANTDB_TemplateDetails *pd);
+ enum GNUNET_DB_QueryStatus
+ (*lookup_template)(void *cls,
+ const char *instance_id,
+ const char *template_id,
+ struct TALER_MERCHANTDB_TemplateDetails *pd);
/**
* Delete information about a template.
@@ -2458,13 +2458,12 @@ enum GNUNET_DB_QueryStatus
* @param instance_id instance to delete product of
* @param template_id template to delete
* @return DB status code, #GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
- * if template unknow.
+ * if template unknown.
*/
-enum GNUNET_DB_QueryStatus
-(*delete_template) (void *cls,
- const char *instance_id,
- const char *template_id);
-
+ enum GNUNET_DB_QueryStatus
+ (*delete_template)(void *cls,
+ const char *instance_id,
+ const char *template_id);
/**
@@ -2476,12 +2475,11 @@ enum GNUNET_DB_QueryStatus
* @param pd the template details to insert
* @return database result code
*/
-enum GNUNET_DB_QueryStatus
-(*insert_template) (void *cls,
- const char *instance_id,
- const char *template_id,
- const struct TALER_MERCHANTDB_TemplateDetails *pd);
-
+ enum GNUNET_DB_QueryStatus
+ (*insert_template)(void *cls,
+ const char *instance_id,
+ const char *template_id,
+ const struct TALER_MERCHANTDB_TemplateDetails *pd);
/**
@@ -2496,11 +2494,11 @@ enum GNUNET_DB_QueryStatus
* does not yet exist.
*/
-enum GNUNET_DB_QueryStatus
-(*update_template) (void *cls,
- const char *instance_id,
- const char *template_id,
- const struct TALER_MERCHANTDB_TemplateDetails *pd);
+ enum GNUNET_DB_QueryStatus
+ (*update_template)(void *cls,
+ const char *instance_id,
+ const char *template_id,
+ const struct TALER_MERCHANTDB_TemplateDetails *pd);
};
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: -typos,
gnunet <=