From b38f251beb236bf8b716f76a130d9a44660ee506 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 17 Sep 2021 11:35:10 +0200 Subject: -DCE, nicer return values --- src/exchange-tools/taler-exchange-dbinit.c | 2 +- src/exchangedb/plugin_exchangedb_postgres.c | 14 ++++---------- src/include/taler_exchangedb_plugin.h | 16 ++++++++-------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/exchange-tools/taler-exchange-dbinit.c b/src/exchange-tools/taler-exchange-dbinit.c index b187cff33..acc37be8d 100644 --- a/src/exchange-tools/taler-exchange-dbinit.c +++ b/src/exchange-tools/taler-exchange-dbinit.c @@ -128,7 +128,7 @@ run (void *cls, * * @param argc number of arguments from the command line * @param argv command line arguments - * @return 0 ok, 1 on error + * @return 0 ok, non-zero on error */ int main (int argc, diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 817c1a18c..74dc8779b 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -130,12 +130,6 @@ struct PostgresClosure */ const char *transaction_name; - /** - * Number of registered listerners. @e event_thread - * should terminate if this value reaches 0. - */ - uint64_t listener_count; - /** * Did we initialize the prepared statements * for this session? @@ -151,7 +145,7 @@ struct PostgresClosure * @param cls the `struct PostgresClosure` with the plugin-specific state * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure */ -static int +static enum GNUNET_GenericReturnValue postgres_drop_tables (void *cls) { struct PostgresClosure *pg = cls; @@ -175,7 +169,7 @@ postgres_drop_tables (void *cls) * @param cls the `struct PostgresClosure` with the plugin-specific state * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure */ -static int +static enum GNUNET_GenericReturnValue postgres_create_tables (void *cls) { struct PostgresClosure *pg = cls; @@ -2613,7 +2607,7 @@ postgres_preflight (void *cls) * must point to a constant * @return #GNUNET_OK on success */ -static int +static enum GNUNET_GenericReturnValue postgres_start (void *cls, const char *name) { @@ -2651,7 +2645,7 @@ postgres_start (void *cls, * must point to a constant * @return #GNUNET_OK on success */ -static int +static enum GNUNET_GenericReturnValue postgres_start_read_committed (void *cls, const char *name) { diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 4037ebac0..03e0b64c3 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -2059,8 +2059,8 @@ struct TALER_EXCHANGEDB_Plugin * @param cls the @e cls of this struct with the plugin-specific state * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure */ - int - (*drop_tables) (void *cls); + enum GNUNET_GenericReturnValue + (*drop_tables)(void *cls); /** @@ -2069,8 +2069,8 @@ struct TALER_EXCHANGEDB_Plugin * @param cls the @e cls of this struct with the plugin-specific state * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure */ - int - (*create_tables) (void *cls); + enum GNUNET_GenericReturnValue + (*create_tables)(void *cls); /** @@ -2081,9 +2081,9 @@ struct TALER_EXCHANGEDB_Plugin * must point to a constant * @return #GNUNET_OK on success */ - int - (*start) (void *cls, - const char *name); + enum GNUNET_GenericReturnValue + (*start)(void *cls, + const char *name); /** @@ -2094,7 +2094,7 @@ struct TALER_EXCHANGEDB_Plugin * must point to a constant * @return #GNUNET_OK on success */ - int + enum GNUNET_GenericReturnValue (*start_read_committed)(void *cls, const char *name); -- cgit v1.2.3