From 472b34daf3787e0a05891a1f1cdfc89316b8fc8b Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 7 Nov 2018 06:56:51 -0800 Subject: Fix wrong uses of ~s for function name string. * ffi.c (make_ffi_type_enum): Use ~a for function name rather than ~s because it's a string which is quoted under ~s. * lib.c (chk_xalloc, string_extend, find_symbol, intern_fallback): Likewise. * stream.c (open_process, run): Likewise. * sysif.c (exec_wrap, setgroups_wrap, dlclose_wrap): Likewise. --- sysif.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sysif.c') diff --git a/sysif.c b/sysif.c index 1020f075..b3b9c5b9 100644 --- a/sysif.c +++ b/sysif.c @@ -572,7 +572,7 @@ val exec_wrap(val file, val args_opt) val args = default_null_arg(args_opt); int nargs = c_num(length(args)) + 1; char **argv = if3(nargs < 0 || nargs == INT_MAX, - (uw_throwf(file_error_s, lit("~s: argument list overflow"), + (uw_throwf(file_error_s, lit("~a: argument list overflow"), self, nao), convert(char **, 0)), coerce(char **, chk_xalloc(nargs + 1, sizeof *argv, self))); val iter; @@ -1074,7 +1074,7 @@ static val setgroups_wrap(val list) ucnum len = c_num(length(list)); if (convert(ucnum, convert(size_t, len)) != len) { - uw_throwf(system_error_s, lit("~s: list too long"), self, nao); + uw_throwf(system_error_s, lit("~a: list too long"), self, nao); } else { gid_t *arr = coerce(gid_t *, chk_xalloc(len, sizeof *arr, self)); int i = 0, res; @@ -1508,7 +1508,7 @@ static val dlclose_wrap(val cptr) val self = lit("dlclose"); mem_t *ptr = cptr_handle(cptr, dlhandle_s, self); if (cptr->co.ops != &cptr_dl_ops) - uw_throwf(error_s, lit("~s: object ~s isn't a handle from dlopen"), + uw_throwf(error_s, lit("~a: object ~s isn't a handle from dlopen"), self, cptr, nao); if (ptr != 0) { int res = dlclose(ptr); -- cgit v1.2.3