simplify the code copying the macro name, and sync the

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index afe80b481aa65d2bb206bbc7d6c3b43b7a5370d4..d55b1120f0c2eb91d54a5dc7f3f93bc255cc7091 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -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>
 /*
  * 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;
 
        /* 
        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) {
        mac[j] = '\0';
 
        if (j == 4 || j < 2) {