From a31ad16733b6da5a45803a9482e330d17f690636 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 7 Sep 2015 07:21:02 -0700 Subject: Don't use prot1 for temporary gc protection. * lib.c (split_str, split_str_set, list_str, int_str): Use gc_hint rather than prot1/rel1. More efficient, doesn't use space in the prot_stack array. * regex.c (search_regex): Likewise. * stream.c (vformat_str, formatv, run): Likewise. In formatv, rel1 wasn't being called in the uw_unwind block, so this fixes a bug. --- stream.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'stream.c') diff --git a/stream.c b/stream.c index 85b356b2..950e687d 100644 --- a/stream.c +++ b/stream.c @@ -2118,8 +2118,6 @@ static void vformat_str(val stream, val str, int width, enum align align, cnum i, w; wchar_t wc; - prot1(&str); - vformat_align_pre(stream, align, slack); if (fitlen == INT_PTR_MAX) { @@ -2134,7 +2132,7 @@ static void vformat_str(val stream, val str, int width, enum align align, vformat_align_post(stream, align, slack); - rel1(&str); + gc_hint(str); } val formatv(val stream_in, val fmtstr, struct args *al) @@ -2149,8 +2147,6 @@ val formatv(val stream_in, val fmtstr, struct args *al) uw_simple_catch_begin; - prot1(&fmtstr); - { const wchar_t *fmt = c_str(fmtstr); enum { @@ -2505,10 +2501,10 @@ val formatv(val stream_in, val fmtstr, struct args *al) set_indent_mode(stream, save_mode); } - rel1(&fmtstr); - uw_catch_end; + gc_hint(fmtstr); + return (stream_in) ? t : get_string_from_stream(stream); } @@ -3122,8 +3118,6 @@ static val run(val command, val args) args = default_bool_arg(args); nargs = c_num(length(args)) + 1; - prot1(&args); - wargv = coerce(const wchar_t **, chk_malloc((nargs + 2) * sizeof *wargv)); for (i = 0, iter = cons(command, args); iter; i++, iter = cdr(iter)) @@ -3134,7 +3128,7 @@ static val run(val command, val args) free(strip_qual(wchar_t **, wargv)); - rel1(&args); + gc_hint(args); return (status < 0) ? nil : num(status); } -- cgit v1.2.3