aboutsummaryrefslogtreecommitdiffstats
path: root/libfonts_decode_font_description.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2023-01-10 18:45:42 +0100
committerMattias Andrée <maandree@kth.se>2023-01-10 18:45:42 +0100
commitabf2630e7039c53126faf6585769e2abfba657dd (patch)
tree68a97f64a78472154a1da3fb988022ccf417bc49 /libfonts_decode_font_description.c
parentm (diff)
downloadlibfonts-abf2630e7039c53126faf6585769e2abfba657dd.tar.gz
libfonts-abf2630e7039c53126faf6585769e2abfba657dd.tar.bz2
libfonts-abf2630e7039c53126faf6585769e2abfba657dd.tar.xz
m + implement libfonts_do_{decoded_,}font_descriptions_match
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'libfonts_decode_font_description.c')
-rw-r--r--libfonts_decode_font_description.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/libfonts_decode_font_description.c b/libfonts_decode_font_description.c
index b06257e..b67a5cd 100644
--- a/libfonts_decode_font_description.c
+++ b/libfonts_decode_font_description.c
@@ -3,19 +3,19 @@
#ifndef TEST
-#define LIST_FIELDS_EXCEPT_FINAL(X)\
- X(foundry)\
- X(family_name)\
- X(weight_name)\
- X(slant)\
- X(setwidth_name)\
- X(add_style_name)\
- X(pixel_size)\
- X(point_size)\
- X(resolution_x)\
- X(resolution_y)\
- X(spacing)\
- X(average_width)\
+#define LIST_FIELDS_EXCEPT_FINAL(X, _)\
+ X(foundry) _\
+ X(family_name) _\
+ X(weight_name) _\
+ X(slant) _\
+ X(setwidth_name) _\
+ X(add_style_name) _\
+ X(pixel_size) _\
+ X(point_size) _\
+ X(resolution_x) _\
+ X(resolution_y) _\
+ X(spacing) _\
+ X(average_width) _\
X(charset_registry)
@@ -169,8 +169,8 @@ libfonts_decode_font_description(struct libfonts_font_description *desc, const c
desc->F = buf;\
for (s++; *s && *s != '-'; s++)\
*buf++ = *s == '~' ? '-' : *s;\
- *buf++ = '\0';
- LIST_FIELDS_EXCEPT_FINAL(X)
+ *buf++ = '\0'
+ LIST_FIELDS_EXCEPT_FINAL(X, ;);
#undef X
if (*s != '-')