Skip to content

Commit 43bd9a9

Browse files
committed
src/acme.c: fix spelling "ressources" ==> "resources"
fixes haproxy#3040 "ressources" was used as a variable name, let's use English variant to make spell check happier
1 parent 02db0e6 commit 43bd9a9

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

include/haproxy/acme-t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct acme_cfg {
3131
};
3232

3333
enum acme_st {
34-
ACME_RESSOURCES = 0,
34+
ACME_RESOURCES = 0,
3535
ACME_NEWNONCE,
3636
ACME_CHKACCOUNT,
3737
ACME_NEWACCOUNT,

src/acme.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,9 @@ static void acme_ctx_destroy(struct acme_ctx *ctx)
639639
if (!ctx)
640640
return;
641641

642-
istfree(&ctx->ressources.newNonce);
643-
istfree(&ctx->ressources.newAccount);
644-
istfree(&ctx->ressources.newOrder);
642+
istfree(&ctx->resources.newNonce);
643+
istfree(&ctx->resources.newAccount);
644+
istfree(&ctx->resources.newOrder);
645645
istfree(&ctx->nonce);
646646
istfree(&ctx->kid);
647647
istfree(&ctx->order);
@@ -1456,10 +1456,10 @@ int acme_req_neworder(struct task *task, struct acme_ctx *ctx, char **errmsg)
14561456
chunk_appendf(req_in, " ] }");
14571457

14581458

1459-
if (acme_jws_payload(req_in, ctx->nonce, ctx->ressources.newOrder, ctx->cfg->account.pkey, ctx->kid, req_out, errmsg) != 0)
1459+
if (acme_jws_payload(req_in, ctx->nonce, ctx->resources.newOrder, ctx->cfg->account.pkey, ctx->kid, req_out, errmsg) != 0)
14601460
goto error;
14611461

1462-
if (acme_http_req(task, ctx, ctx->ressources.newOrder, HTTP_METH_POST, hdrs, ist2(req_out->area, req_out->data)))
1462+
if (acme_http_req(task, ctx, ctx->resources.newOrder, HTTP_METH_POST, hdrs, ist2(req_out->area, req_out->data)))
14631463
goto error;
14641464

14651465
ret = 0;
@@ -1610,10 +1610,10 @@ int acme_req_account(struct task *task, struct acme_ctx *ctx, int newaccount, ch
16101610
else
16111611
chunk_printf(req_in, "%s", accountreq);
16121612

1613-
if (acme_jws_payload(req_in, ctx->nonce, ctx->ressources.newAccount, ctx->cfg->account.pkey, ctx->kid, req_out, errmsg) != 0)
1613+
if (acme_jws_payload(req_in, ctx->nonce, ctx->resources.newAccount, ctx->cfg->account.pkey, ctx->kid, req_out, errmsg) != 0)
16141614
goto error;
16151615

1616-
if (acme_http_req(task, ctx, ctx->ressources.newAccount, HTTP_METH_POST, hdrs, ist2(req_out->area, req_out->data)))
1616+
if (acme_http_req(task, ctx, ctx->resources.newAccount, HTTP_METH_POST, hdrs, ist2(req_out->area, req_out->data)))
16171617
goto error;
16181618

16191619
ret = 0;
@@ -1747,8 +1747,8 @@ int acme_directory(struct task *task, struct acme_ctx *ctx, char **errmsg)
17471747
memprintf(errmsg, "couldn't get newNonce URL from the directory URL");
17481748
goto error;
17491749
}
1750-
ctx->ressources.newNonce = istdup(ist2(trash.area, ret));
1751-
if (!isttest(ctx->ressources.newNonce)) {
1750+
ctx->resources.newNonce = istdup(ist2(trash.area, ret));
1751+
if (!isttest(ctx->resources.newNonce)) {
17521752
memprintf(errmsg, "couldn't get newNonce URL from the directory URL");
17531753
goto error;
17541754
}
@@ -1757,17 +1757,17 @@ int acme_directory(struct task *task, struct acme_ctx *ctx, char **errmsg)
17571757
memprintf(errmsg, "couldn't get newAccount URL from the directory URL");
17581758
goto error;
17591759
}
1760-
ctx->ressources.newAccount = istdup(ist2(trash.area, ret));
1761-
if (!isttest(ctx->ressources.newAccount)) {
1760+
ctx->resources.newAccount = istdup(ist2(trash.area, ret));
1761+
if (!isttest(ctx->resources.newAccount)) {
17621762
memprintf(errmsg, "couldn't get newAccount URL from the directory URL");
17631763
goto error;
17641764
}
17651765
if ((ret = mjson_get_string(hc->res.buf.area, hc->res.buf.data, "$.newOrder", trash.area, trash.size)) <= 0) {
17661766
memprintf(errmsg, "couldn't get newOrder URL from the directory URL");
17671767
goto error;
17681768
}
1769-
ctx->ressources.newOrder = istdup(ist2(trash.area, ret));
1770-
if (!isttest(ctx->ressources.newOrder)) {
1769+
ctx->resources.newOrder = istdup(ist2(trash.area, ret));
1770+
if (!isttest(ctx->resources.newOrder)) {
17711771
memprintf(errmsg, "couldn't get newOrder URL from the directory URL");
17721772
goto error;
17731773
}
@@ -1776,17 +1776,17 @@ int acme_directory(struct task *task, struct acme_ctx *ctx, char **errmsg)
17761776
ctx->hc = NULL;
17771777

17781778
// fprintf(stderr, "newNonce: %s\nnewAccount: %s\nnewOrder: %s\n",
1779-
// ctx->ressources.newNonce.ptr, ctx->ressources.newAccount.ptr, ctx->ressources.newOrder.ptr);
1779+
// ctx->resources.newNonce.ptr, ctx->resources.newAccount.ptr, ctx->resources.newOrder.ptr);
17801780

17811781
return 0;
17821782

17831783
error:
17841784
httpclient_destroy(hc);
17851785
ctx->hc = NULL;
17861786

1787-
istfree(&ctx->ressources.newNonce);
1788-
istfree(&ctx->ressources.newAccount);
1789-
istfree(&ctx->ressources.newOrder);
1787+
istfree(&ctx->resources.newNonce);
1788+
istfree(&ctx->resources.newAccount);
1789+
istfree(&ctx->resources.newOrder);
17901790

17911791
return 1;
17921792
}
@@ -1808,7 +1808,7 @@ struct task *acme_process(struct task *task, void *context, unsigned int state)
18081808
re:
18091809

18101810
switch (st) {
1811-
case ACME_RESSOURCES:
1811+
case ACME_RESOURCES:
18121812
if (http_st == ACME_HTTP_REQ) {
18131813
if (acme_http_req(task, ctx, ist(ctx->cfg->directory), HTTP_METH_GET, NULL, IST_NULL) != 0)
18141814
goto retry;
@@ -1824,7 +1824,7 @@ struct task *acme_process(struct task *task, void *context, unsigned int state)
18241824
break;
18251825
case ACME_NEWNONCE:
18261826
if (http_st == ACME_HTTP_REQ) {
1827-
if (acme_http_req(task, ctx, ctx->ressources.newNonce, HTTP_METH_HEAD, NULL, IST_NULL) != 0)
1827+
if (acme_http_req(task, ctx, ctx->resources.newNonce, HTTP_METH_HEAD, NULL, IST_NULL) != 0)
18281828
goto retry;
18291829
}
18301830
if (http_st == ACME_HTTP_RES) {

0 commit comments

Comments
 (0)