From 7aa4fed542b20bfc4062938e30d02eb782305285 Mon Sep 17 00:00:00 2001 From: Andrew Clayton Date: Tue, 19 May 2026 04:44:34 +0100 Subject: [PATCH 1/3] Update to version 3.0 of the 'Individuals Capital Gains Income' API Signed-off-by: Andrew Clayton --- src/mtd-cli-icgi.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/mtd-cli-icgi.c b/src/mtd-cli-icgi.c index 2c13e8f..268cab0 100644 --- a/src/mtd-cli-icgi.c +++ b/src/mtd-cli-icgi.c @@ -3,7 +3,7 @@ /* * mtd-cli-icgi.c - Make Tax Digital - Individuals Capital Gains Income * - * Copyright (C) 2025 Andrew Clayton + * Copyright (C) 2025 - 2026 Andrew Clayton */ #include @@ -17,17 +17,17 @@ #define API_NAME "Individuals Capital Gains Income" #define CMDS \ "Residential Property Disposals\n\n"\ -"rpd-get non-ppd-amend non-ppd-delete ppd-amend ppd-delete\n\n"\ +"non-ppd-get non-ppd-amend non-ppd-delete ppd-get ppd-amend ppd-delete\n\n"\ "Other Capital Gains and Disposals\n\n"\ "o-get o-amend o-delete" static const struct endpoint endpoints[] = { /* Residential Property Disposals */ { - .name = "rpd-get", - .api_ep = MTD_API_EP_ICGI_RPD_GET, + .name = "non-ppd-get", + .api_ep = MTD_API_EP_ICGI_RPD_N_PPD_GET, .nr_req_args = 1, - .args = "taxYear [source={user,hmrc-held,latest}]" + .args = "taxYear" }, { .name = "non-ppd-amend", .api_ep = MTD_API_EP_ICGI_RPD_N_PPD_AMEND, @@ -39,6 +39,11 @@ static const struct endpoint endpoints[] = { .api_ep = MTD_API_EP_ICGI_RPD_N_PPD_DELETE, .nr_req_args = 1, .args = "taxYear" + }, { + .name = "ppd-get", + .api_ep = MTD_API_EP_ICGI_RPD_PPD_GET, + .nr_req_args = 1, + .args = "taxYear [source={user,hmrc-held,latest}]" }, { .name = "ppd-amend", .api_ep = MTD_API_EP_ICGI_RPD_PPD_AMEND, From 60baaf2b801bc7d28e30e7295804e58763c7d7b5 Mon Sep 17 00:00:00 2001 From: Andrew Clayton Date: Tue, 19 May 2026 04:56:12 +0100 Subject: [PATCH 2/3] Fix a couple of compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 16 is throwing mtd-cli.c: In function ‘set_log_fp’: mtd-cli.c:397:13: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 397 | ptr = strchr(log_level, ':'); | ^ mtd-cli.c:400:14: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 400 | ptrm = strchr(log_level, '+'); | IIRC this is due to changes in the return value of various string functions, now if they take a const src parameter they will return a pointer to const string. We pass log_level in as a const string, but then we may end up modifying it through a non-const pointer. Best to just take a copy of it and operate on that. Signed-off-by: Andrew Clayton --- src/mtd-cli.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/mtd-cli.c b/src/mtd-cli.c index 92ee0a9..567505e 100644 --- a/src/mtd-cli.c +++ b/src/mtd-cli.c @@ -387,6 +387,8 @@ static const char *conf_dir(char *path) static const FILE *set_log_fp(const char *log_level) { + FILE *fp; + char *ll; char *ptr; char *ptrm; const char *mode = "we"; @@ -394,10 +396,14 @@ static const FILE *set_log_fp(const char *log_level) if (!log_level || !strchr(log_level, ':')) return NULL; - ptr = strchr(log_level, ':'); + ll = strdup(log_level); + if (!ll) + return NULL; + + ptr = strchr(ll, ':'); ptr++; - ptrm = strchr(log_level, '+'); + ptrm = strchr(ll, '+'); if (!ptrm) goto out; @@ -407,7 +413,10 @@ static const FILE *set_log_fp(const char *log_level) mode = "ae"; out: - return fopen(ptr, mode); + fp = fopen(ptr, mode); + free(ll); + + return fp; } int main(int argc, char *argv[]) From bb4873f9f3ddf1c58c0c402069ff0ff1d9f9894c Mon Sep 17 00:00:00 2001 From: Andrew Clayton Date: Tue, 19 May 2026 05:20:53 +0100 Subject: [PATCH 3/3] ci: Update the cirrus ci FreeBSD version to 14-3 Signed-off-by: Andrew Clayton --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8ae673a..3930d60 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,5 @@ freebsd_instance: - image_family: freebsd-14-2 + image_family: freebsd-14-3 cpu: 1 memory: 1G