Subject: Re: bug#15818: src/dfa.c: *MALLOC comment block: Clarify comment wording

From: Jim Meyering <[email-masked]>
Date: Wed, 25 Dec 2013 18:04:27 -0800

Patch attached, this time:
From 9dd6e76cb856985296262ff587b6d6e44f4df157 Mon Sep 17 00:00:00 2001
From: Brenton Hoff <[email-masked]>
Date: Wed, 25 Dec 2013 17:55:13 -0800
Subject: [PATCH 1/2] maint: fix a garbled comment

* src/dfa.c (XNMALLOC, etc.): Fix garbled comment wording.
---
 src/dfa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dfa.c b/src/dfa.c
index f196b8a..af2b95d 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -433,7 +433,7 @@ static void dfamust (struct dfa *dfa);
 static void regexp (void);

 /* These two macros are identical to the ones in gnulib's xalloc.h,
-   except that they not to case the result to "(t *)", and thus may
+   except that they do not cast the result to "(t *)", and thus may
    be used via type-free CALLOC and MALLOC macros.  */
 #undef XNMALLOC
 #undef XCALLOC
-- 
1.8.5.rc2.6.gc6f1b92

From 8174415901106b82326584f8e4ea0f14974a2169 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email-masked]>
Date: Wed, 25 Dec 2013 17:59:05 -0800
Subject: [PATCH 2/2] maint: fix inconsistent spacing in expression

* src/main.c (prline): Fix inconsistent spacing in expression:
s/  / /.
---
 src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index 8b7b492..1ea5a33 100644
--- a/src/main.c
+++ b/src/main.c
@@ -931,7 +931,7 @@ prline (char const *beg, char const *lim, int sep)
     line_color = match_color = NULL; /* Shouldn't be used.  */

   if ((only_matching && matching)
-      || (color_option  && (*line_color || *match_color)))
+      || (color_option && (*line_color || *match_color)))
     {
       /* We already know that non-matching lines have no match (to colorize). */
       if (matching && (only_matching || *match_color))
-- 
1.8.5.rc2.6.gc6f1b92