cleanup

3 files changed, 12 insertions, 19 deletions

diff --git a/taler_wallet_core_lib.c b/taler_wallet_core_lib.c
index 1f89670..1cfaf5c 100644
--- a/taler_wallet_core_lib.c
+++ b/taler_wallet_core_lib.c
@@ -329,8 +329,8 @@ TALER_start_redirect_std(TALER_LogFn logfn, void *cls)
 }
 
 void
-TALER_set_http_client_implementation(struct TALER_WALLET_Instance *instance,
+TALER_set_http_client_implementation(struct TALER_WALLET_Instance *twi,
                                      struct JSHttpClientImplementation *impl)
 {
-  instance->http_impl = impl;
+  twi->http_impl = impl;
 }
diff --git a/taler_wallet_core_lib.h b/taler_wallet_core_lib.h
index 660690d..3620d1f 100644
--- a/taler_wallet_core_lib.h
+++ b/taler_wallet_core_lib.h
@@ -78,7 +78,6 @@ TALER_WALLET_set_message_handler(struct TALER_WALLET_Instance *twi,
                                  TALER_WALLET_MessageHandlerFn handler_f,
                                  void *handler_p);
 
-
 /**
  * Set a handler for log messages from wallet-core.
  * Must be called before the wallet runs.
@@ -90,7 +89,6 @@ TALER_WALLET_set_log_handler(struct TALER_WALLET_Instance *twi,
                              TALER_WALLET_LogHandlerFn handler_f,
                              void *handler_p);
 
-
 /**
  * Set/override the JS file with the wallet-core implementation.
  * Must be called before the wallet runs.
@@ -143,7 +141,7 @@ TALER_WALLET_join(struct TALER_WALLET_Instance *twi);
  * @param stream NOT YET IMPLEMENTED: indicator for the stream that
  *               the message is coming from,
  */
-typedef void (*TALER_LogFn)(void *cls, int stream, const char *msg);
+typedef void (*TALER_LogFn)(void *handler_p, int stream, const char *msg);
 
 /**
  * Redirect stderr and stdout to a function.
@@ -153,17 +151,16 @@ typedef void (*TALER_LogFn)(void *cls, int stream, const char *msg);
  * @return 0 on success, error code otherwise
  */
 int
-TALER_start_redirect_std(TALER_LogFn logfn, void *cls);
-
+TALER_start_redirect_std(TALER_LogFn logfn, void *handler_p);
 
 /**
  * Set the HTTP client implementation to be used by the wallet.
  *
- * @param instance wallet-core instance
- * @param HTTP client implementation
+ * @param twi wallet-core instance
+ * @param impl HTTP client implementation
  */
 void
-TALER_set_http_client_implementation(struct TALER_WALLET_Instance *instance,
+TALER_set_http_client_implementation(struct TALER_WALLET_Instance *twi,
                                      struct JSHttpClientImplementation *impl);
 
 #endif /*_TALER_WALLET_LIB_H */
diff --git a/taler_wallet_core_lib_preprocessed.h b/taler_wallet_core_lib_preprocessed.h
index 336b650..f8872c8 100644
--- a/taler_wallet_core_lib_preprocessed.h
+++ b/taler_wallet_core_lib_preprocessed.h
@@ -228,7 +228,6 @@ struct JSHttpClientImplementation {
   JSHttpReqCancelFn req_cancel;
 };
 
-
 struct JSHttpClientImplementation *
 js_curl_http_client_create(void);
 
@@ -288,7 +287,6 @@ TALER_WALLET_set_message_handler(struct TALER_WALLET_Instance *twi,
                                  TALER_WALLET_MessageHandlerFn handler_f,
                                  void *handler_p);
 
-
 /**
  * Set a handler for log messages from wallet-core.
  * Must be called before the wallet runs.
@@ -300,7 +298,6 @@ TALER_WALLET_set_log_handler(struct TALER_WALLET_Instance *twi,
                              TALER_WALLET_LogHandlerFn handler_f,
                              void *handler_p);
 
-
 /**
  * Set/override the JS file with the wallet-core implementation.
  * Must be called before the wallet runs.
@@ -353,7 +350,7 @@ TALER_WALLET_join(struct TALER_WALLET_Instance *twi);
  * @param stream NOT YET IMPLEMENTED: indicator for the stream that
  *               the message is coming from,
  */
-typedef void (*TALER_LogFn)(void *cls, int stream, const char *msg);
+typedef void (*TALER_LogFn)(void *handler_p, int stream, const char *msg);
 
 /**
  * Redirect stderr and stdout to a function.
@@ -363,17 +360,16 @@ typedef void (*TALER_LogFn)(void *cls, int stream, const char *msg);
  * @return 0 on success, error code otherwise
  */
 int
-TALER_start_redirect_std(TALER_LogFn logfn, void *cls);
-
+TALER_start_redirect_std(TALER_LogFn logfn, void *handler_p);
 
 /**
  * Set the HTTP client implementation to be used by the wallet.
  *
- * @param instance wallet-core instance
- * @param HTTP client implementation
+ * @param twi wallet-core instance
+ * @param impl HTTP client implementation
  */
 void
-TALER_set_http_client_implementation(struct TALER_WALLET_Instance *instance,
+TALER_set_http_client_implementation(struct TALER_WALLET_Instance *twi,
                                      struct JSHttpClientImplementation *impl);
 
 #endif /*_TALER_WALLET_LIB_H */