diff options
| author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2021-11-08 07:09:44 +1100 |
|---|---|---|
| committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2021-11-08 07:10:49 +1100 |
| commit | f635b2c052dccffa53804ee7506fd42fde619d90 (patch) | |
| tree | 1446fc8d8ca8a5ac89a359ca4550dbe94d7d087d /src/libs | |
| parent | 5b7fee5d6392edf90dc1f0fa7d013f36fea5964c (diff) | |
| download | groff-git-f635b2c052dccffa53804ee7506fd42fde619d90.tar.gz | |
Revert "[libgroff,pic]: Use `strsave()`, not `strdup()`."
This reverts commit 5b7fee5d6392edf90dc1f0fa7d013f36fea5964c.
Ingo Schwarze observed[1] that we should be migrating away from this
strdup() replacement, not entrenching it.
[1] https://lists.gnu.org/archive/html/groff/2021-11/msg00039.html
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/libgroff/font.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/libs/libgroff/font.cpp b/src/libs/libgroff/font.cpp index b7960b7eb..2168afa1b 100644 --- a/src/libs/libgroff/font.cpp +++ b/src/libs/libgroff/font.cpp @@ -1144,7 +1144,7 @@ bool font::load_desc() return false; } bool found_paper = false; - char *savedp = strsave(p); + char *savedp = strdup(p); while (p) { double unscaled_paperwidth, unscaled_paperlength; if (scan_papersize(p, &papersize, &unscaled_paperlength, @@ -1157,13 +1157,8 @@ bool font::load_desc() p = strtok(0, WS); } if (!found_paper) { - if (0 == savedp) - t.error("unable to determine a paper format"); - else { - t.error("unable to determine a paper format from '%1'", - savedp); - free(savedp); - } + t.error("unable to determine a paper format from '%1'", savedp); + free(savedp); return false; } free(savedp); |