>From fe6ed193c3eb8bf99aa6440158bbd4f7ae8122f0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 Dec 2020 11:54:20 +0100 Subject: [PATCH 6/6] filenamecat-tests: Use idx_t for nonnegative ptrdiff_t variables. * tests/test-filenamecat.c: Include idx.h. (main): Mark prefixlen as nonnegative. * modules/filenamecat-tests (Depends-on): Add idx. --- ChangeLog | 7 +++++++ modules/filenamecat-tests | 1 + tests/test-filenamecat.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9c0fef9..5364c15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2020-12-05 Bruno Haible + filenamecat-tests: Use idx_t for nonnegative ptrdiff_t variables. + * tests/test-filenamecat.c: Include idx.h. + (main): Mark prefixlen as nonnegative. + * modules/filenamecat-tests (Depends-on): Add idx. + +2020-12-05 Bruno Haible + time_rz: Use idx_t for nonnegative ptrdiff_t variables. * lib/time_rz.c: Include idx.h. (save_abbr): Mark zone_size as nonnegative. diff --git a/modules/filenamecat-tests b/modules/filenamecat-tests index 14d3c17..7b2a98f 100644 --- a/modules/filenamecat-tests +++ b/modules/filenamecat-tests @@ -2,6 +2,7 @@ Files: tests/test-filenamecat.c Depends-on: +idx stdbool configure.ac: diff --git a/tests/test-filenamecat.c b/tests/test-filenamecat.c index a6f236e..40259dc 100644 --- a/tests/test-filenamecat.c +++ b/tests/test-filenamecat.c @@ -21,6 +21,8 @@ #include "filenamecat.h" +#include "idx.h" + #include #include #include @@ -54,7 +56,7 @@ main (int argc _GL_UNUSED, char *argv[]) char *base_in_result; char const *const *t = tests[i]; char *res = file_name_concat (t[0], t[1], &base_in_result); - ptrdiff_t prefixlen = base_in_result - res; + idx_t prefixlen = base_in_result - res; size_t t0len = strlen (t[0]); size_t reslen = strlen (res); if (strcmp (res, t[2]) != 0) -- 2.7.4