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

diff --git a/man.c b/man.c
index bf65d919351ccdd13e29a00ca52952225eb9383b..d0e577a644ddd2c0d765f014cc121d3a4ed90a0a 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.85 2010/08/07 20:57:33 kristaps Exp $ */
+/*     $Id: man.c,v 1.86 2010/08/08 14:51:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -480,14 +480,14 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
 
        ppos = i;
 
-       /* Copy the first word into a nil-terminated buffer. */
-
-       for (j = 0; j < 4; j++, i++)
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
+       /*
+        * Copy the first word into a nil-terminated buffer.
+        * Stop copying when a tab, space, or eoln is encountered.
+        */
 
+       j = 0;
+       while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
+               mac[j++] = buf[i++];
        mac[j] = '\0';
 
        if (j == 4 || j < 1) {

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>
@@ -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) {