=================================================================== RCS file: /cvs/mandoc/chars.c,v retrieving revision 1.23 retrieving revision 1.26 diff -u -p -r1.23 -r1.26 --- mandoc/chars.c 2010/07/18 12:10:08 1.23 +++ mandoc/chars.c 2010/08/16 09:51:17 1.26 @@ -1,6 +1,6 @@ -/* $Id: chars.c,v 1.23 2010/07/18 12:10:08 kristaps Exp $ */ +/* $Id: chars.c,v 1.26 2010/08/16 09:51:17 kristaps Exp $ */ /* - * Copyright (c) 2009 Kristaps Dzonsons + * Copyright (c) 2009, 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,7 +33,6 @@ struct ln { struct ln *next; const char *code; const char *ascii; - size_t asciisz; int unicode; int type; #define CHARS_CHAR (1 << 0) @@ -41,14 +40,14 @@ struct ln { #define CHARS_BOTH (CHARS_CHAR | CHARS_STRING) }; -#define LINES_MAX 370 +#define LINES_MAX 369 -#define CHAR(in, ch, chsz, code) \ - { NULL, (in), (ch), (chsz), (code), CHARS_CHAR }, -#define STRING(in, ch, chsz, code) \ - { NULL, (in), (ch), (chsz), (code), CHARS_STRING }, -#define BOTH(in, ch, chsz, code) \ - { NULL, (in), (ch), (chsz), (code), CHARS_BOTH }, +#define CHAR(in, ch, code) \ + { NULL, (in), (ch), (code), CHARS_CHAR }, +#define STRING(in, ch, code) \ + { NULL, (in), (ch), (code), CHARS_STRING }, +#define BOTH(in, ch, code) \ + { NULL, (in), (ch), (code), CHARS_BOTH }, #define CHAR_TBL_START static struct ln lines[LINES_MAX] = { #define CHAR_TBL_END }; @@ -165,7 +164,7 @@ chars_spec2str(void *arg, const char *p, size_t sz, si if (NULL == ln) return(NULL); - *rsz = ln->asciisz; + *rsz = strlen(ln->ascii); return(ln->ascii); } @@ -182,7 +181,7 @@ chars_res2str(void *arg, const char *p, size_t sz, siz if (NULL == ln) return(NULL); - *rsz = ln->asciisz; + *rsz = strlen(ln->ascii); return(ln->ascii); }