[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated (234feb8 -> 4a11769)
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] branch master updated (234feb8 -> 4a11769) |
|
Date: |
Wed, 14 Oct 2020 15:42:58 +0200 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a change to branch master
in repository anastasis.
from 234feb8 async state management
new 07cabf7 fix
new a17fb8b fix merge conflict
new 4a11769 fix
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/include/anastasis_redux.h | 44 --------------------------------
src/lib/anastasis_api_backup_redux.c | 12 ++++-----
src/lib/anastasis_api_recovery_redux.c | 14 +++++------
src/lib/anastasis_api_redux.c | 26 +++++++++----------
src/lib/anastasis_api_redux.h | 46 +++++++++++++++++++++++++++++++++-
5 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/src/include/anastasis_redux.h b/src/include/anastasis_redux.h
index 5913453..b11ba9c 100644
--- a/src/include/anastasis_redux.h
+++ b/src/include/anastasis_redux.h
@@ -192,54 +192,10 @@ typedef void
struct ANASTASIS_ReduxAction;
-/**
- * Operates on a backup state depending on given #ANASTASIS_BackupState
- * and #ANASTASIS_BackupAction. The new #ANASTASIS_BackupState is returned
- * by a callback function.
- * This function can do network access to talk to anastasis service providers.
- *
- * @param ctx the CURL context used to connect to the backend
- * @param[in,out] state input/output state (to be modified)
- * @param action what action to perform
- * @param arguments data for the @a action
- * @param cb function to call with the result
- * @param cb_cls closure for @a cb
- */
-struct ANASTASIS_ReduxAction *
-ANASTASIS_backup_action (struct GNUNET_CURL_Context *ctx,
- json_t *state,
- const char *action,
- const json_t *arguments,
- ANASTASIS_ActionCallback cb,
- void *cb_cls);
-
-
void
ANASTASIS_action_cancel (struct ANASTASIS_ReduxAction *ra);
-/**
- * Operates on a recovery state depending on given #ANASTASIS_RecoveryState
- * and #ANASTASIS_RecoveryAction. The new #ANASTASIS_RecoveryState is returned
- * by a callback function.
- * This function can do network access to talk to anastasis service providers.
- *
- * @param ctx the CURL context used to connect to the backend
- * @param[in,out] state input/output state (to be modified)
- * @param action what action to perform
- * @param arguments data for the @a action
- * @param cb function to call with the result
- * @param cb_cls closure for @a cb
- */
-struct ANASTASIS_ReduxAction *
-ANASTASIS_recovery_action (struct GNUNET_CURL_Context *ctx,
- json_t *state,
- const char *action,
- const json_t *arguments,
- ANASTASIS_ActionCallback cb,
- void *cb_cls);
-
-
/**
* Operates on a state depending on given #ANASTASIS_BackupState
* or #ANASTASIS_RecoveryState and #ANASTASIS_BackupAction or
diff --git a/src/lib/anastasis_api_backup_redux.c
b/src/lib/anastasis_api_backup_redux.c
index 726b9fb..9cfde59 100644
--- a/src/lib/anastasis_api_backup_redux.c
+++ b/src/lib/anastasis_api_backup_redux.c
@@ -523,12 +523,12 @@ add_policy (json_t *state,
* @param cb_cls closure for @a cb
*/
struct ANASTASIS_ReduxAction *
-ANASTASIS_backup_action (struct GNUNET_CURL_Context *ctx,
- json_t *state,
- const char *action,
- const json_t *arguments,
- ANASTASIS_ActionCallback cb,
- void *cb_cls)
+ANASTASIS_backup_action_ (struct GNUNET_CURL_Context *ctx,
+ json_t *state,
+ const char *action,
+ const json_t *arguments,
+ ANASTASIS_ActionCallback cb,
+ void *cb_cls)
{
struct Dispatcher
{
diff --git a/src/lib/anastasis_api_recovery_redux.c
b/src/lib/anastasis_api_recovery_redux.c
index f89c82c..63b8d60 100644
--- a/src/lib/anastasis_api_recovery_redux.c
+++ b/src/lib/anastasis_api_recovery_redux.c
@@ -149,13 +149,13 @@ ANASTASIS_recovery_start (const struct
GNUNET_CONFIGURATION_Handle *cfg)
* @param cb function to call with the result
* @param cb_cls closure for @a cb
*/
-void
-ANASTASIS_recovery_action (struct GNUNET_CURL_Context *ctx,
- json_t *state,
- const char *action,
- const json_t *arguments,
- ANASTASIS_ActionCallback cb,
- void *cb_cls)
+struct ANASTASIS_ReduxAction *
+ANASTASIS_recovery_action_ (struct GNUNET_CURL_Context *ctx,
+ json_t *state,
+ const char *action,
+ const json_t *arguments,
+ ANASTASIS_ActionCallback cb,
+ void *cb_cls)
{
struct Dispatcher
{
diff --git a/src/lib/anastasis_api_redux.c b/src/lib/anastasis_api_redux.c
index 5ed32ed..46f685f 100644
--- a/src/lib/anastasis_api_redux.c
+++ b/src/lib/anastasis_api_redux.c
@@ -851,7 +851,7 @@ ANASTASIS_redux_action (const json_t *state,
cb (cb_cls,
ANASTASIS_EC_INVALID, // FIXME: Define correct error code
NULL);
- return;
+ return NULL;
}
}
gs = ANASTASIS_generic_state_from_string (s);
@@ -884,21 +884,21 @@ ANASTASIS_redux_action (const json_t *state,
}
if (recovery_mode)
{
- ret = ANASTASIS_recovery_action (ctx,
- new_state,
- action,
- arguments,
- cb,
- NULL);
+ ret = ANASTASIS_recovery_action_ (ctx,
+ new_state,
+ action,
+ arguments,
+ cb,
+ NULL);
}
else
{
- ret = ANASTASIS_backup_action (ctx,
- new_state,
- action,
- arguments,
- cb,
- NULL);
+ ret = ANASTASIS_backup_action_ (ctx,
+ new_state,
+ action,
+ arguments,
+ cb,
+ NULL);
}
json_decref (new_state);
return ret;
diff --git a/src/lib/anastasis_api_redux.h b/src/lib/anastasis_api_redux.h
index 217478c..f2de11e 100644
--- a/src/lib/anastasis_api_redux.h
+++ b/src/lib/anastasis_api_redux.h
@@ -1,7 +1,7 @@
#ifndef ANASTASIS_API_REDUX_H
#define ANASTASIS_API_REDUX_H
-void
+struct ANASTASIS_ReduxAction *
ANASTASIS_back_generic_decrement_ (json_t *state,
const json_t *arguments,
ANASTASIS_ActionCallback cb,
@@ -18,6 +18,50 @@ json_t *
ANASTASIS_redux_countries_init_ (void);
+/**
+ * Operates on a recovery state depending on given #ANASTASIS_RecoveryState
+ * and #ANASTASIS_RecoveryAction. The new #ANASTASIS_RecoveryState is returned
+ * by a callback function.
+ * This function can do network access to talk to anastasis service providers.
+ *
+ * @param ctx the CURL context used to connect to the backend
+ * @param[in,out] state input/output state (to be modified)
+ * @param action what action to perform
+ * @param arguments data for the @a action
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ */
+struct ANASTASIS_ReduxAction *
+ANASTASIS_recovery_action_ (struct GNUNET_CURL_Context *ctx,
+ json_t *state,
+ const char *action,
+ const json_t *arguments,
+ ANASTASIS_ActionCallback cb,
+ void *cb_cls);
+
+
+/**
+ * Operates on a backup state depending on given #ANASTASIS_BackupState
+ * and #ANASTASIS_BackupAction. The new #ANASTASIS_BackupState is returned
+ * by a callback function.
+ * This function can do network access to talk to anastasis service providers.
+ *
+ * @param ctx the CURL context used to connect to the backend
+ * @param[in,out] state input/output state (to be modified)
+ * @param action what action to perform
+ * @param arguments data for the @a action
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ */
+struct ANASTASIS_ReduxAction *
+ANASTASIS_backup_action_ (struct GNUNET_CURL_Context *ctx,
+ json_t *state,
+ const char *action,
+ const json_t *arguments,
+ ANASTASIS_ActionCallback cb,
+ void *cb_cls);
+
+
/**
* Generic container for an action with asynchronous activities.
*/
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-anastasis] branch master updated (234feb8 -> 4a11769),
gnunet <=