git: d69677407ef5 - stable/13 - libdtrace: Trivial style fixes to force dt_lex.c to be regenerated

[Mark Johnston]

The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=d69677407ef5ba3bd038d595447c1302e720ea1b

commit d69677407ef5ba3bd038d595447c1302e720ea1b
Author:     Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-02-20 02:44:20 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-02-20 16:39:53 +0000

    libdtrace: Trivial style fixes to force dt_lex.c to be regenerated
    
    After commit 8ba333e02e ("libdtrace: Stop relying on lex
    compatibility"), there have been several reports of incremental
    buildworlds failing since make does not know that dt_lex.c needs to be
    regenerated, and I want to avoid this when merging to stable/13.
    
    MFC with:       8ba333e02e
    
    (cherry picked from commit 150fc89a12a7e41b8e7f5777d2ed762f7e40ea92)
---
 .../contrib/opensolaris/lib/libdtrace/common/dt_lex.l | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
index 192e1e20d82c..7dcf21652586 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
@@ -51,16 +51,17 @@
 /*
  * Define YY_INPUT for flex since input() can't be re-defined.
  */
-#define YY_INPUT(buf,result,max_size) \
-	if (yypcb->pcb_fileptr != NULL) { \
-		if (((result = fread(buf, 1, max_size, yypcb->pcb_fileptr)) == 0) \
-		    && ferror(yypcb->pcb_fileptr)) \
+#define YY_INPUT(buf, result, max_size)			\
+	if (yypcb->pcb_fileptr != NULL) {		\
+		if (((result = fread(buf, 1, max_size, yypcb->pcb_fileptr)) == \
+		    0) && ferror(yypcb->pcb_fileptr))	\
 			longjmp(yypcb->pcb_jmpbuf, EDT_FIO); \
-	} else { \
-		int n; \
-		for (n = 0; n < max_size && \
-		    yypcb->pcb_strptr < yypcb->pcb_string + yypcb->pcb_strlen; n++) \
-			buf[n] = *yypcb->pcb_strptr++; \
+	} else {					\
+		int n;					\
+		for (n = 0; n < max_size &&		\
+		    yypcb->pcb_strptr < yypcb->pcb_string + yypcb->pcb_strlen; \
+		    n++)				\
+			buf[n] = *yypcb->pcb_strptr++;	\
 		result = n; \
 	}
 /*