summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>1996-07-26 03:39:15 +0000
committerMiles Bader <miles@gnu.org>1996-07-26 03:39:15 +0000
commitbb3b3ae5f4087ff995dcc43fcf3e45dec1660875 (patch)
treed82a410c8ef295c488a664991f9bc1d632f9c053
parent9e994b70b835b638330416fb5a1ad43590446d71 (diff)
(hol_entry_help): Never return without restoring margins.
-rw-r--r--libshouldbeinlibc/argp-help.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libshouldbeinlibc/argp-help.c b/libshouldbeinlibc/argp-help.c
index a56b999b..b8b519e2 100644
--- a/libshouldbeinlibc/argp-help.c
+++ b/libshouldbeinlibc/argp-help.c
@@ -546,7 +546,7 @@ hol_entry_help (struct hol_entry *entry, FILE *stream,
}
else
/* Just a totally shadowed option or null header; print nothing. */
- return;
+ goto cleanup; /* Just return, after cleaning up. */
else if (real->doc)
/* Now the option documentation. */
{
@@ -568,11 +568,13 @@ hol_entry_help (struct hol_entry *entry, FILE *stream,
line_wrap_set_lmargin (stream, 0); /* Don't follow the nl with spaces. */
putc ('\n', stream);
- line_wrap_set_lmargin (stream, old_lm);
- line_wrap_set_wmargin (stream, old_wm);
if (prev_entry)
*prev_entry = entry;
+
+cleanup:
+ line_wrap_set_lmargin (stream, old_lm);
+ line_wrap_set_wmargin (stream, old_wm);
}
/* Output a long help message about the options in HOL to STREAM. */