[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 05/15: [libgroff]: Slightly refactor.
From: |
G. Branden Robinson |
Subject: |
[groff] 05/15: [libgroff]: Slightly refactor. |
Date: |
Fri, 17 Sep 2021 05:34:36 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit bbb9d01fa701b7e20a6690a7819cd2df7c995e9c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Sep 17 09:24:08 2021 +1000
[libgroff]: Slightly refactor.
* src/libs/libgroff/font.cpp (font::load): Use same loop style as
`font::load_desc()`.
Also:
* Wrap long source line.
* Use same declaration order as `font::load_desc()`.
* Use prevailing brace style.
---
ChangeLog | 7 +++++++
src/libs/libgroff/font.cpp | 17 +++++++----------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b247a61..47aeb18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2021-09-17 G. Branden Robinson <g.branden.robinson@gmail.com>
+ [libgroff]: Slightly refactor.
+
+ * src/libs/libgroff/font.cpp (font::load): Use same loop style
+ as `font::load_desc()`.
+
+2021-09-17 G. Branden Robinson <g.branden.robinson@gmail.com>
+
[libgroff]: Fix off-by-one error in font and device description
file reader diagnostics.
diff --git a/src/libs/libgroff/font.cpp b/src/libs/libgroff/font.cpp
index c152f17..f03f448 100644
--- a/src/libs/libgroff/font.cpp
+++ b/src/libs/libgroff/font.cpp
@@ -81,8 +81,8 @@ struct text_file {
const errarg &arg3 = empty_errarg);
};
-text_file::text_file(FILE *p, char *s)
-: fp(p), path(s), lineno(1), size(0), skip_comments(1), silent(0), buf(0)
+text_file::text_file(FILE *p, char *s) : fp(p), path(s), lineno(1),
+ size(0), skip_comments(1), silent(0), buf(0)
{
}
@@ -770,8 +770,8 @@ bool font::load(int *not_found, bool head_only)
error("'DESC' is not a valid font file name");
return false;
}
- char *path;
FILE *fp;
+ char *path;
if ((fp = open_file(name, &path)) == NULL) {
if (not_found)
*not_found = 1;
@@ -782,12 +782,8 @@ bool font::load(int *not_found, bool head_only)
text_file t(fp, path);
t.skip_comments = 1;
t.silent = head_only;
- char *p;
- for (;;) {
- if (!t.next_line()) {
- p = 0;
- break;
- }
+ char *p = 0;
+ while (t.next_line()) {
p = strtok(t.buf, WS);
if (strcmp(p, "name") == 0) {
}
@@ -856,7 +852,8 @@ bool font::load(int *not_found, bool head_only)
t.error("missing charset command");
return false;
}
- } else {
+ }
+ else {
char *command = p;
t.skip_comments = 0;
while (command) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 05/15: [libgroff]: Slightly refactor.,
G. Branden Robinson <=