From f91d6f00a5de409e23d376034b3f8e9ac43a3b7a Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Sun, 14 Jan 2018 10:24:48 +0000 Subject: [PATCH] LC_IDENTIFICATION-optional-fields In LC_IDENTIFICATION, audience, application and abbreviation keywords are optional, thus do not report an error if they are not defined. # DP: Dpatch author: Denis Barbier # DP: Patch author: Denis Barbier # DP: Upstream status: not submitted # DP: Date: 2006-01-08 Gbp-Pq: Topic locale Gbp-Pq: Name LC_IDENTIFICATION-optional-fields.diff --- locale/programs/ld-identification.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c index 3e3ea649d..0e1dc9f4c 100644 --- a/locale/programs/ld-identification.c +++ b/locale/programs/ld-identification.c @@ -147,6 +147,9 @@ No definition for %s category found"), "LC_IDENTIFICATION")); "LC_IDENTIFICATION", #cat)); \ identification->cat = ""; \ } +#define TEST_ELEM_OPT(cat) \ + if (identification->cat == NULL) \ + identification->cat = ""; \ TEST_ELEM (title); TEST_ELEM (source); @@ -157,9 +160,9 @@ No definition for %s category found"), "LC_IDENTIFICATION")); TEST_ELEM (fax); TEST_ELEM (language); TEST_ELEM (territory); - TEST_ELEM (audience); - TEST_ELEM (application); - TEST_ELEM (abbreviation); + TEST_ELEM_OPT (audience); + TEST_ELEM_OPT (application); + TEST_ELEM_OPT (abbreviation); TEST_ELEM (revision); TEST_ELEM (date); -- 2.30.2