diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
| commit | cfd1f17f1a85d95ea12bca8dae42add7dad1ad11 (patch) | |
| tree | 8016486f8ee7157213f2d09ff2491bfa9c94638a /lib/uninorm/composition.c | |
| parent | 14e4d584d0121031ec40e6c35869745f1747ff29 (diff) | |
| parent | 1403307d6e2fb4e7b5d97a35f40d1e95134561ab (diff) | |
Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master
Diffstat (limited to 'lib/uninorm/composition.c')
| -rw-r--r-- | lib/uninorm/composition.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/uninorm/composition.c b/lib/uninorm/composition.c index ecc4ed21..c5d088bc 100644 --- a/lib/uninorm/composition.c +++ b/lib/uninorm/composition.c @@ -1,5 +1,5 @@ /* Canonical composition of Unicode characters. - Copyright (C) 2002, 2006, 2009, 2011-2024 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009, 2011-2026 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include <string.h> -struct composition_rule { char codes[6]; unsigned int combined; }; +struct composition_rule { char codes[6] _GL_ATTRIBUTE_NONSTRING; unsigned int combined; }; #include "composition-table.h" #include "composition-table-bounds.h" @@ -69,8 +69,6 @@ uc_composition (ucs4_t uc1, ucs4_t uc2) } #else char codes[6]; - const struct composition_rule *rule; - codes[0] = (uc1 >> 16) & 0xff; codes[1] = (uc1 >> 8) & 0xff; codes[2] = uc1 & 0xff; @@ -78,7 +76,7 @@ uc_composition (ucs4_t uc1, ucs4_t uc2) codes[4] = (uc2 >> 8) & 0xff; codes[5] = uc2 & 0xff; - rule = gl_uninorm_compose_lookup (codes, 6); + const struct composition_rule *rule = gl_uninorm_compose_lookup (codes, 6); if (rule != NULL) return rule->combined; #endif |