aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-02-20 02:44:20 +0000
committerMark Johnston <markj@FreeBSD.org>2021-02-20 16:39:53 +0000
commitd69677407ef5ba3bd038d595447c1302e720ea1b (patch)
tree245ddfac6ad45481da4ed29d350f3a33d1bba9b6
parentaf80731179386cf019463e392370b6478a714aea (diff)
downloadsrc-d69677407ef5ba3bd038d595447c1302e720ea1b.tar.gz
src-d69677407ef5ba3bd038d595447c1302e720ea1b.zip
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)
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l19
1 files 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; \
}
/*