fix merge conflict

5 files changed, 24 insertions, 24 deletions

diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index 2a4b0ca8f..3fd727235 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -741,24 +741,24 @@ TALER_refresh_get_commitment (struct TALER_RefreshCommitmentP *rc,
  * Compute the hash of the given wire details.   The resulting
  * hash is what is put into the contract.
  *
- * @param payto_url bank account
+ * @param payto_uri bank account
  * @param[out] hc set to the hash
  */
 void
-TALER_exchange_wire_signature_hash (const char *payto_url,
+TALER_exchange_wire_signature_hash (const char *payto_uri,
                                     struct GNUNET_HashCode *hc);
 
 
 /**
  * Check the signature in @a wire_s.
  *
- * @param payto_url URL that is signed
+ * @param payto_uri URL that is signed
  * @param master_pub master public key of the exchange
  * @param master_sig signature of the exchange
  * @return #GNUNET_OK if signature is valid
  */
 int
-TALER_exchange_wire_signature_check (const char *payto_url,
+TALER_exchange_wire_signature_check (const char *payto_uri,
                                      const struct
                                      TALER_MasterPublicKeyP *master_pub,
                                      const struct
@@ -768,12 +768,12 @@ TALER_exchange_wire_signature_check (const char *payto_url,
 /**
  * Create a signed wire statement for the given account.
  *
- * @param payto_url account specification
+ * @param payto_uri account specification
  * @param master_priv private key to sign with
  * @param[out] master_sig where to write the signature
  */
 void
-TALER_exchange_wire_signature_make (const char *payto_url,
+TALER_exchange_wire_signature_make (const char *payto_uri,
                                     const struct
                                     TALER_MasterPrivateKeyP *master_priv,
                                     struct TALER_MasterSignatureP *master_sig);
@@ -783,12 +783,12 @@ TALER_exchange_wire_signature_make (const char *payto_url,
  * Compute the hash of the given wire details.   The resulting
  * hash is what is put into the contract.
  *
- * @param payto_url bank account
+ * @param payto_uri bank account
  * @param salt salt used to eliminate brute-force inversion
  * @param[out] hc set to the hash
  */
 void
-TALER_merchant_wire_signature_hash (const char *payto_url,
+TALER_merchant_wire_signature_hash (const char *payto_uri,
                                     const char *salt,
                                     struct GNUNET_HashCode *hc);
 
@@ -796,14 +796,14 @@ TALER_merchant_wire_signature_hash (const char *payto_url,
 /**
  * Check the signature in @a wire_s.
  *
- * @param payto_url URL that is signed
- * @param salt the salt used to salt the @a payto_url when hashing
+ * @param payto_uri URL that is signed
+ * @param salt the salt used to salt the @a payto_uri when hashing
  * @param merch_pub public key of the merchant
  * @param merch_sig signature of the merchant
  * @return #GNUNET_OK if signature is valid
  */
 int
-TALER_merchant_wire_signature_check (const char *payto_url,
+TALER_merchant_wire_signature_check (const char *payto_uri,
                                      const char *salt,
                                      const struct
                                      TALER_MerchantPublicKeyP *merch_pub,
@@ -814,13 +814,13 @@ TALER_merchant_wire_signature_check (const char *payto_url,
 /**
  * Create a signed wire statement for the given account.
  *
- * @param payto_url account specification
- * @param salt the salt used to salt the @a payto_url when hashing
+ * @param payto_uri account specification
+ * @param salt the salt used to salt the @a payto_uri when hashing
  * @param merch_priv private key to sign with
  * @param[out] merch_sig where to write the signature
  */
 void
-TALER_merchant_wire_signature_make (const char *payto_url,
+TALER_merchant_wire_signature_make (const char *payto_uri,
                                     const char *salt,
                                     const struct
                                     TALER_MerchantPrivateKeyP *merch_priv,
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 1c29e15c1..09eca8ed4 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -628,9 +628,9 @@ struct TALER_EXCHANGE_WireAggregateFees
 struct TALER_EXCHANGE_WireAccount
 {
   /**
-   * payto://-URL of the exchange.
+   * payto://-URI of the exchange.
    */
-  const char *url;
+  const char *payto_uri;
 
   /**
    * Signature of the exchange over the account (was checked by the API).
@@ -639,7 +639,7 @@ struct TALER_EXCHANGE_WireAccount
 
   /**
    * Linked list of wire fees the exchange charges for
-   * accounts of the wire method matching @e url.
+   * accounts of the wire method matching @e payto_uri.
    */
   const struct TALER_EXCHANGE_WireAggregateFees *fees;
 
diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h
index 67097fd14..655527b36 100644
--- a/src/include/taler_exchangedb_lib.h
+++ b/src/include/taler_exchangedb_lib.h
@@ -401,7 +401,7 @@ struct TALER_EXCHANGEDB_AccountInfo
   /**
    * payto://-URL of the account.
    */
-  const char *payto_url;
+  const char *payto_uri;
 
   /**
    * Filename containing the signed /wire response, or NULL
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index 9c6f31652..3d4896d3b 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -170,11 +170,11 @@ TALER_JSON_exchange_wire_signature_check (const json_t *wire_s,
 /**
  * Create a signed wire statement for the given account.
  *
- * @param payto_url account specification
+ * @param payto_uri account specification
  * @param master_priv private key to sign with, NULL to not sign
  */
 json_t *
-TALER_JSON_exchange_wire_signature_make (const char *payto_url,
+TALER_JSON_exchange_wire_signature_make (const char *payto_uri,
                                          const struct
                                          TALER_MasterPrivateKeyP *master_priv);
 
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 58b1906c2..3f5935728 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -237,13 +237,13 @@ TALER_url_absolute_mhd (struct MHD_Connection *connection,
 
 
 /**
- * Obtain the payment method from a @a payto_url
+ * Obtain the payment method from a @a payto_uri
  *
- * @param payto_url the URL to parse
- * @return NULL on error (malformed @a payto_url)
+ * @param payto_uri the URL to parse
+ * @return NULL on error (malformed @a payto_uri)
  */
 char *
-TALER_payto_get_method (const char *payto_url);
+TALER_payto_get_method (const char *payto_uri);
 
 
 /**