=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/chars.c,v retrieving revision 1.9 retrieving revision 1.10 diff -c -r1.9 -r1.10 *** src/usr.bin/mandoc/chars.c 2010/07/25 18:05:54 1.9 --- src/usr.bin/mandoc/chars.c 2010/07/31 21:43:07 1.10 *************** *** 1,4 **** ! /* $Id: chars.c,v 1.9 2010/07/25 18:05:54 schwarze Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * --- 1,4 ---- ! /* $Id: chars.c,v 1.10 2010/07/31 21:43:07 schwarze Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * *************** *** 29,35 **** struct ln *next; const char *code; const char *ascii; - size_t asciisz; int unicode; int type; #define CHARS_CHAR (1 << 0) --- 29,34 ---- *************** *** 39,50 **** #define LINES_MAX 370 ! #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_TBL_START static struct ln lines[LINES_MAX] = { #define CHAR_TBL_END }; --- 38,49 ---- #define LINES_MAX 370 ! #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 }; *************** *** 161,167 **** if (NULL == ln) return(NULL); ! *rsz = ln->asciisz; return(ln->ascii); } --- 160,166 ---- if (NULL == ln) return(NULL); ! *rsz = strlen(ln->ascii); return(ln->ascii); } *************** *** 178,184 **** if (NULL == ln) return(NULL); ! *rsz = ln->asciisz; return(ln->ascii); } --- 177,183 ---- if (NULL == ln) return(NULL); ! *rsz = strlen(ln->ascii); return(ln->ascii); }