From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Mon, 23 Aug 2021 19:31:23 +0000 (+0100)
Subject: LC_IDENTIFICATION-optional-fields
X-Git-Tag: archive/raspbian/2.32-4+rpi1~2^2~156
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bdd8f70ec157ad8ff5026101b2d0244bdbb51a8b;p=glibc.git

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
---

diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c
index c620e9bc6..42c486230 100644
--- a/locale/programs/ld-identification.c
+++ b/locale/programs/ld-identification.c
@@ -145,6 +145,9 @@ No definition for %s category found"), "LC_IDENTIFICATION");
 			#cat);						      \
       identification->cat = "";						      \
     }
+#define TEST_ELEM_OPT(cat)						      \
+  if (identification->cat == NULL)					      \
+    identification->cat = "";						      \
 
   TEST_ELEM (title);
   TEST_ELEM (source);
@@ -155,9 +158,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);