[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 15/24: [troff]: Boolify `file_iterator` constructor.
From: |
G. Branden Robinson |
Subject: |
[groff] 15/24: [troff]: Boolify `file_iterator` constructor. |
Date: |
Sun, 10 Nov 2024 14:56:22 -0500 (EST) |
gbranden pushed a commit to branch master
in repository groff.
commit f0417db8f802daa1d1c6b441d3b62b1238324ab1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Nov 9 11:03:44 2024 -0600
[troff]: Boolify `file_iterator` constructor.
* src/roff/troff/input.cpp (file_iterator::file_iterator): Boolify and
rename third argument, demoting integer `po` to Boolean `popened`.
Use Boolean literal for default argument.
(pipe_source_request): Use Boolean literal at call site.
---
ChangeLog | 7 +++++++
src/roff/troff/input.cpp | 11 ++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4f5f531fa..2bf94e35f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-11-09 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ * src/roff/troff/input.cpp (file_iterator::file_iterator):
+ Boolify and rename third argument, demoting integer `po` to
+ Boolean `popened`. Use Boolean literal for default argument.
+ (pipe_source_request): Use Boolean literal at call site.
+
2024-11-09 G. Branden Robinson <g.branden.robinson@gmail.com>
* src/roff/troff/input.cpp (has_args): Slightly refactor; use
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index d330ba91a..b5dbdaa35 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -394,7 +394,7 @@ class file_iterator : public input_iterator {
unsigned char buf[BUF_SIZE];
void close();
public:
- file_iterator(FILE *, const char *, int = 0);
+ file_iterator(FILE *, const char *, bool = false);
~file_iterator();
int fill(node **);
int peek();
@@ -406,14 +406,14 @@ public:
bool is_file() { return true; }
};
-file_iterator::file_iterator(FILE *f, const char *fn, int po)
-: fp(f), lineno(1), filename(fn), was_popened(po),
+file_iterator::file_iterator(FILE *f, const char *fn, bool popened)
+: fp(f), lineno(1), filename(fn), was_popened(popened),
seen_newline(false), seen_escape(false)
{
if ((font::use_charnames_in_special) && (fn != 0 /* nullptr */)) {
if (!the_output)
init_output();
- the_output->put_filename(fn, po);
+ the_output->put_filename(fn, popened);
}
}
@@ -6645,7 +6645,8 @@ void pipe_source_request() // .pso
errno = 0;
FILE *fp = popen(buf, POPEN_RT);
if (fp)
- input_stack::push(new file_iterator(fp, symbol(buf).contents(), 1));
+ input_stack::push(new file_iterator(fp, symbol(buf).contents(),
+ true));
else
error("cannot open pipe to process '%1': %2", buf,
strerror(errno));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 15/24: [troff]: Boolify `file_iterator` constructor.,
G. Branden Robinson <=