diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2010-08-08 14:51:32 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2010-08-08 14:51:32 +0000 |
| commit | 0ce539688658d136200d6e00abbb9db7b7a7c363 (patch) | |
| tree | 829a19e0b276e322e1be1043e78d6a6e4506f88c /mdoc.c | |
| parent | 60d06b6c8ec84a910dd17c21f2e368ae8e32dc10 (diff) | |
| download | mandoc-0ce539688658d136200d6e00abbb9db7b7a7c363.tar.gz mandoc-0ce539688658d136200d6e00abbb9db7b7a7c363.tar.zst mandoc-0ce539688658d136200d6e00abbb9db7b7a7c363.zip | |
simplify the code copying the macro name, and sync the
accompagnying comment between man_pmacro() and mdoc_pmacro();
ok'd by kristaps@ together with main.c rev. 1.102
Diffstat (limited to 'mdoc.c')
| -rw-r--r-- | mdoc.c | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.161 2010/08/07 20:57:33 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.162 2010/08/08 14:51:32 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -776,16 +776,13 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) sv = i; /* - * Copy the first word into a nil-terminated buffer. Stop - * copying when a tab, space, or eoln is encountered. + * Copy the first word into a nil-terminated buffer. + * Stop copying when a tab, space, or eoln is encountered. */ - for (j = 0; j < 4; j++, i++) - if ('\0' == (mac[j] = buf[i])) - break; - else if (' ' == buf[i] || '\t' == buf[i]) - break; - + j = 0; + while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i]) + mac[j++] = buf[i++]; mac[j] = '\0'; if (j == 4 || j < 2) { |