From 1893831efb87d2fcf4d2a94531f2457da41f3979 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 29 Nov 2021 17:51:25 +0100 Subject: -fix typos --- ...r-merchant-httpd_private-get-instances-ID-kyc.c | 2 +- src/include/taler_merchant_testing_lib.h | 2 +- src/mustach/README.md | 6 ++-- src/mustach/mustach-jansson.h | 8 ++--- src/mustach/mustach.h | 6 ++-- src/mustach/test1/json | 6 ++-- src/mustach/test1/must | 4 +-- src/mustach/test1/resu.ref | 12 ++++---- src/mustach/test5/json | 6 ++-- src/mustach/test5/must3.mustache | 4 +-- src/mustach/test5/resu.ref | 12 ++++---- src/mustach/test6/json | 6 ++-- src/mustach/test6/must | 4 +-- src/mustach/test6/resu.ref | 36 +++++++++++----------- 14 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c index b018b282..d18ea668 100644 --- a/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c +++ b/src/backend/taler-merchant-httpd_private-get-instances-ID-kyc.c @@ -475,7 +475,7 @@ exchange_check_cb (void *cls, if (NULL != kc->exchange_pending_head) return; /* wait for more */ /* All exchange requests done, create final - big respose from cummulated replies */ + big response from cummulated replies */ if ( (0 == json_array_size (kc->pending_kycs)) && (0 == json_array_size (kc->timeout_kycs)) ) { diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h index 38149d25..de49336f 100644 --- a/src/include/taler_merchant_testing_lib.h +++ b/src/include/taler_merchant_testing_lib.h @@ -1475,7 +1475,7 @@ TALER_TESTING_cmd_tip_pickup (const char *label, * @param merchant_url base URL of the merchant * @param instance_id instance to use, NULL if instance is part of @a merchant_url * @param h_wire_ref label of command with a merchant wire hash trait - * of the bank acount to check KYC for; NULL to check all accounts + * of the bank account to check KYC for; NULL to check all accounts * @param exchange_url base URL of the exchange to check KYC status for * @param expected_http_status expected HTTP status * @return the command diff --git a/src/mustach/README.md b/src/mustach/README.md index 1ad57262..a6df19f6 100644 --- a/src/mustach/README.md +++ b/src/mustach/README.md @@ -57,7 +57,7 @@ It then outputs the result of applying the templates files to the JSON file. ### Portability Some system does not provide *open_memstream*. In that case, tell your -prefered compiler to declare the preprocessor symbol **NO_OPEN_MEMSTREAM**. +preferred compiler to declare the preprocessor symbol **NO_OPEN_MEMSTREAM**. Example: gcc -DNO_OPEN_MEMSTREAM @@ -84,7 +84,7 @@ By default, the current implementation provides the following extensions: This is a core extension implemented in file **mustach.c**. -In somecases the name of the key used for substition begins with a +In somecases the name of the key used for substitution begins with a character reserved for mustach: one of `#`, `^`, `/`, `&`, `{`, `>` and `=`. This extension introduces the special character `:` to explicitly tell mustach to just substitute the value. So `:` becomes a new special @@ -141,7 +141,7 @@ of implementation specific. - `NO_COLON_EXTENSION_FOR_MUSTACH` This macro remove the ability to use colon (:) - as explicit command for variable substituion. + as explicit command for variable substitution. This extension allows to have name starting with one of the mustach character `:#^/&{=>` diff --git a/src/mustach/mustach-jansson.h b/src/mustach/mustach-jansson.h index b4a2ebe6..27dcdd64 100644 --- a/src/mustach/mustach-jansson.h +++ b/src/mustach/mustach-jansson.h @@ -29,7 +29,7 @@ /** * fmustach_jansson - Renders the mustache 'template' in 'file' for 'root'. * - * @template: the template string to instanciate + * @template: the template string to instantiate * @root: the root json object to render * \@file: the file where to write the result * @@ -41,7 +41,7 @@ extern int fmustach_jansson(const char *template, json_t *root, FILE *file); /** * fmustach_jansson - Renders the mustache 'template' in 'fd' for 'root'. * - * @template: the template string to instanciate + * @template: the template string to instantiate * @root: the root json object to render * @fd: the file descriptor number where to write the result * @@ -54,7 +54,7 @@ extern int fdmustach_jansson(const char *template, json_t *root, int fd); /** * fmustach_jansson - Renders the mustache 'template' in 'result' for 'root'. * - * @template: the template string to instanciate + * @template: the template string to instantiate * @root: the root json object to render * @result: the pointer receiving the result when 0 is returned * @size: the size of the returned result @@ -67,7 +67,7 @@ extern int mustach_jansson(const char *template, json_t *root, char **result, si /** * umustach_jansson - Renders the mustache 'template' for 'root' to custom writer 'writecb' with 'closure'. * - * @template: the template string to instanciate + * @template: the template string to instantiate * @root: the root json object to render * @writecb: the function that write values * @closure: the closure for the write function diff --git a/src/mustach/mustach.h b/src/mustach/mustach.h index 1fddb92e..ad952275 100644 --- a/src/mustach/mustach.h +++ b/src/mustach/mustach.h @@ -200,7 +200,7 @@ struct mustach_sbuf { /** * fmustach - Renders the mustache 'template' in 'file' for 'itf' and 'closure'. * - * @template: the template string to instanciate + * @template: the template string to instantiate * @itf: the interface to the functions that mustach calls * @closure: the closure to pass to functions called * \@file: the file where to write the result @@ -213,7 +213,7 @@ extern int fmustach(const char *template, struct mustach_itf *itf, void *closure /** * fmustach - Renders the mustache 'template' in 'fd' for 'itf' and 'closure'. * - * @template: the template string to instanciate + * @template: the template string to instantiate * @itf: the interface to the functions that mustach calls * @closure: the closure to pass to functions called * @fd: the file descriptor number where to write the result @@ -226,7 +226,7 @@ extern int fdmustach(const char *template, struct mustach_itf *itf, void *closur /** * fmustach - Renders the mustache 'template' in 'result' for 'itf' and 'closure'. * - * @template: the template string to instanciate + * @template: the template string to instantiate * @itf: the interface to the functions that mustach calls * @closure: the closure to pass to functions called * @result: the pointer receiving the result when 0 is returned diff --git a/src/mustach/test1/json b/src/mustach/test1/json index bf8e37a1..5b2e3d83 100644 --- a/src/mustach/test1/json +++ b/src/mustach/test1/json @@ -5,9 +5,9 @@ "in_ca": true, "person": false, "repo": [ - { "name": "resque", "who": [ { "commiter": "joe" }, { "reviewer": "avrel" }, { "commiter": "william" } ] }, - { "name": "hub", "who": [ { "commiter": "jack" }, { "reviewer": "avrel" }, { "commiter": "greg" } ] }, - { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "commiter": "greg" } ] } + { "name": "resque", "who": [ { "committer": "joe" }, { "reviewer": "avrel" }, { "committer": "william" } ] }, + { "name": "hub", "who": [ { "committer": "jack" }, { "reviewer": "avrel" }, { "committer": "greg" } ] }, + { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "committer": "greg" } ] } ], "person?": { "name": "Jon" }, "special": "----{{extra}}----", diff --git a/src/mustach/test1/must b/src/mustach/test1/must index 6df52366..723f966c 100644 --- a/src/mustach/test1/must +++ b/src/mustach/test1/must @@ -12,7 +12,7 @@ Shown. {{/person}} {{#repo}} - {{name}} reviewers:{{#who}} {{reviewer}}{{/who}} commiters:{{#who}} {{commiter}}{{/who}} + {{name}} reviewers:{{#who}} {{reviewer}}{{/who}} committers:{{#who}} {{committer}}{{/who}} {{/repo}} {{#person?}} @@ -23,7 +23,7 @@ Shown. ===================================== %(%! gros commentaire %)% %(%#repo%)% - %(%name%)% reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% commiters:%(%#who%)% %(%commiter%)%%(%/who%)% + %(%name%)% reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% committers:%(%#who%)% %(%committer%)%%(%/who%)% %(%/repo%)% ===================================== %(%={{ }}=%)% diff --git a/src/mustach/test1/resu.ref b/src/mustach/test1/resu.ref index 5d4ce862..545e5857 100644 --- a/src/mustach/test1/resu.ref +++ b/src/mustach/test1/resu.ref @@ -10,11 +10,11 @@ Shown. - resque reviewers: avrel commiters: joe william + resque reviewers: avrel committers: joe william - hub reviewers: avrel commiters: jack greg + hub reviewers: avrel committers: jack greg - rip reviewers: joe jack commiters: greg + rip reviewers: joe jack committers: greg @@ -25,11 +25,11 @@ Shown. ===================================== - resque reviewers: avrel commiters: joe william + resque reviewers: avrel committers: joe william - hub reviewers: avrel commiters: jack greg + hub reviewers: avrel committers: jack greg - rip reviewers: joe jack commiters: greg + rip reviewers: joe jack committers: greg ===================================== diff --git a/src/mustach/test5/json b/src/mustach/test5/json index bf8e37a1..5b2e3d83 100644 --- a/src/mustach/test5/json +++ b/src/mustach/test5/json @@ -5,9 +5,9 @@ "in_ca": true, "person": false, "repo": [ - { "name": "resque", "who": [ { "commiter": "joe" }, { "reviewer": "avrel" }, { "commiter": "william" } ] }, - { "name": "hub", "who": [ { "commiter": "jack" }, { "reviewer": "avrel" }, { "commiter": "greg" } ] }, - { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "commiter": "greg" } ] } + { "name": "resque", "who": [ { "committer": "joe" }, { "reviewer": "avrel" }, { "committer": "william" } ] }, + { "name": "hub", "who": [ { "committer": "jack" }, { "reviewer": "avrel" }, { "committer": "greg" } ] }, + { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "committer": "greg" } ] } ], "person?": { "name": "Jon" }, "special": "----{{extra}}----", diff --git a/src/mustach/test5/must3.mustache b/src/mustach/test5/must3.mustache index 67eddb1e..821aaac3 100644 --- a/src/mustach/test5/must3.mustache +++ b/src/mustach/test5/must3.mustache @@ -1,6 +1,6 @@ must3.mustache == BEGIN {{#repo}} - {{name}} reviewers:{{#who}} {{reviewer}}{{/who}} commiters:{{#who}} {{commiter}}{{/who}} + {{name}} reviewers:{{#who}} {{reviewer}}{{/who}} committers:{{#who}} {{committer}}{{/who}} {{/repo}} {{#person?}} @@ -11,7 +11,7 @@ must3.mustache == BEGIN ===================================== %(%! big comment %)% %(%#repo%)% - %(%name%)% reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% commiters:%(%#who%)% %(%commiter%)%%(%/who%)% + %(%name%)% reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% committers:%(%#who%)% %(%committer%)%%(%/who%)% %(%/repo%)% ===================================== must3.mustache == END diff --git a/src/mustach/test5/resu.ref b/src/mustach/test5/resu.ref index 117499fc..afc39659 100644 --- a/src/mustach/test5/resu.ref +++ b/src/mustach/test5/resu.ref @@ -23,11 +23,11 @@ must2 == END last with extension must3.mustache == BEGIN - resque reviewers: avrel commiters: joe william + resque reviewers: avrel committers: joe william - hub reviewers: avrel commiters: jack greg + hub reviewers: avrel committers: jack greg - rip reviewers: joe jack commiters: greg + rip reviewers: joe jack committers: greg @@ -38,11 +38,11 @@ must3.mustache == BEGIN ===================================== - resque reviewers: avrel commiters: joe william + resque reviewers: avrel committers: joe william - hub reviewers: avrel commiters: jack greg + hub reviewers: avrel committers: jack greg - rip reviewers: joe jack commiters: greg + rip reviewers: joe jack committers: greg ===================================== must3.mustache == END diff --git a/src/mustach/test6/json b/src/mustach/test6/json index bf8e37a1..5b2e3d83 100644 --- a/src/mustach/test6/json +++ b/src/mustach/test6/json @@ -5,9 +5,9 @@ "in_ca": true, "person": false, "repo": [ - { "name": "resque", "who": [ { "commiter": "joe" }, { "reviewer": "avrel" }, { "commiter": "william" } ] }, - { "name": "hub", "who": [ { "commiter": "jack" }, { "reviewer": "avrel" }, { "commiter": "greg" } ] }, - { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "commiter": "greg" } ] } + { "name": "resque", "who": [ { "committer": "joe" }, { "reviewer": "avrel" }, { "committer": "william" } ] }, + { "name": "hub", "who": [ { "committer": "jack" }, { "reviewer": "avrel" }, { "committer": "greg" } ] }, + { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "committer": "greg" } ] } ], "person?": { "name": "Jon" }, "special": "----{{extra}}----", diff --git a/src/mustach/test6/must b/src/mustach/test6/must index 6df52366..723f966c 100644 --- a/src/mustach/test6/must +++ b/src/mustach/test6/must @@ -12,7 +12,7 @@ Shown. {{/person}} {{#repo}} - {{name}} reviewers:{{#who}} {{reviewer}}{{/who}} commiters:{{#who}} {{commiter}}{{/who}} + {{name}} reviewers:{{#who}} {{reviewer}}{{/who}} committers:{{#who}} {{committer}}{{/who}} {{/repo}} {{#person?}} @@ -23,7 +23,7 @@ Shown. ===================================== %(%! gros commentaire %)% %(%#repo%)% - %(%name%)% reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% commiters:%(%#who%)% %(%commiter%)%%(%/who%)% + %(%name%)% reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% committers:%(%#who%)% %(%committer%)%%(%/who%)% %(%/repo%)% ===================================== %(%={{ }}=%)% diff --git a/src/mustach/test6/resu.ref b/src/mustach/test6/resu.ref index e983fee6..345d3aef 100644 --- a/src/mustach/test6/resu.ref +++ b/src/mustach/test6/resu.ref @@ -10,11 +10,11 @@ SHOWN. - RESQUE REVIEWERS: AVREL COMMITERS: JOE WILLIAM + RESQUE REVIEWERS: AVREL COMMITTERS: JOE WILLIAM - HUB REVIEWERS: AVREL COMMITERS: JACK GREG + HUB REVIEWERS: AVREL COMMITTERS: JACK GREG - RIP REVIEWERS: JOE JACK COMMITERS: GREG + RIP REVIEWERS: JOE JACK COMMITTERS: GREG @@ -25,11 +25,11 @@ SHOWN. ===================================== - RESQUE REVIEWERS: AVREL COMMITERS: JOE WILLIAM + RESQUE REVIEWERS: AVREL COMMITTERS: JOE WILLIAM - HUB REVIEWERS: AVREL COMMITERS: JACK GREG + HUB REVIEWERS: AVREL COMMITTERS: JACK GREG - RIP REVIEWERS: JOE JACK COMMITERS: GREG + RIP REVIEWERS: JOE JACK COMMITTERS: GREG ===================================== @@ -59,11 +59,11 @@ shown. - resque reviewers: avrel commiters: joe william + resque reviewers: avrel committers: joe william - hub reviewers: avrel commiters: jack greg + hub reviewers: avrel committers: jack greg - rip reviewers: joe jack commiters: greg + rip reviewers: joe jack committers: greg @@ -74,11 +74,11 @@ shown. ===================================== - resque reviewers: avrel commiters: joe william + resque reviewers: avrel committers: joe william - hub reviewers: avrel commiters: jack greg + hub reviewers: avrel committers: jack greg - rip reviewers: joe jack commiters: greg + rip reviewers: joe jack committers: greg ===================================== @@ -108,11 +108,11 @@ Shown. - resque reviewers: avrel commiters: joe william + resque reviewers: avrel committers: joe william - hub reviewers: avrel commiters: jack greg + hub reviewers: avrel committers: jack greg - rip reviewers: joe jack commiters: greg + rip reviewers: joe jack committers: greg @@ -123,11 +123,11 @@ Shown. ===================================== - resque reviewers: avrel commiters: joe william + resque reviewers: avrel committers: joe william - hub reviewers: avrel commiters: jack greg + hub reviewers: avrel committers: jack greg - rip reviewers: joe jack commiters: greg + rip reviewers: joe jack committers: greg ===================================== -- cgit v1.2.3