diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-10-16 02:34:18 -0400 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2019-05-23 16:41:53 +0200 |
| commit | 3ae69f30632dba1677d2ed822297cf4599a8d9dd (patch) | |
| tree | 4f5d8efb70eb1afeccda49f60e5dcf919d48232a /libguile/regex-posix.c | |
| parent | a47a5e6828432fb80c82ce002553f59c6447b911 (diff) | |
| download | guile-3ae69f30632dba1677d2ed822297cf4599a8d9dd.tar.gz | |
Use 'scm_from_utf8_{string,symbol,keyword}' for C string literals.
Partial fix for <https://bugs.gnu.org/33044>.
Reported by Tom de Vries <tdevries@suse.de>.
Fix several instances of the mistake of using 'scm_from_locale_*' for C
strings that originally came from a C string literal. Change several
uses of 'scm_from_latin1_*' as well, to promote the practice of writing
code that works for arbitrary C string literals.
Also add missing years to the copyright notices of changed files, based
on the git history.
* libguile/debug-malloc.c, libguile/deprecation.c, libguile/error.c,
libguile/eval.c, libguile/expand.c, libguile/extensions.c,
libguile/filesys.c, libguile/init.c, libguile/load.c,
libguile/modules.c, libguile/pairs.c, libguile/posix.c,
libguile/print.c, libguile/random.c, libguile/read.c,
libguile/regex-posix.c, libguile/snarf.h, libguile/srfi-13.c,
libguile/stacks.c, libguile/stime.c, libguile/strports.c,
libguile/values.c: Use 'scm_from_utf8_*' where appropriate.
Diffstat (limited to 'libguile/regex-posix.c')
| -rw-r--r-- | libguile/regex-posix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c index 0f359a654..a08da02db 100644 --- a/libguile/regex-posix.c +++ b/libguile/regex-posix.c @@ -1,4 +1,4 @@ -/* Copyright 1997-2001,2004,2006-2007,2010-2012,2018 +/* Copyright 1997-2001,2004,2006-2007,2010-2012,2018-2019 Free Software Foundation, Inc. This file is part of Guile. @@ -176,7 +176,7 @@ SCM_DEFINE (scm_make_regexp, "make-regexp", 1, 0, 1, SCM errmsg = scm_regexp_error_msg (status, rx); scm_gc_free (rx, sizeof(regex_t), "regex"); scm_error_scm (scm_regexp_error_key, - scm_from_locale_string (FUNC_NAME), + scm_from_utf8_string (FUNC_NAME), errmsg, SCM_BOOL_F, scm_list_1 (pat)); @@ -307,7 +307,7 @@ SCM_DEFINE (scm_regexp_exec, "regexp-exec", 2, 2, 0, if (status != 0 && status != REG_NOMATCH) scm_error_scm (scm_regexp_error_key, - scm_from_locale_string (FUNC_NAME), + scm_from_utf8_string (FUNC_NAME), scm_regexp_error_msg (status, SCM_RGX (rx)), SCM_BOOL_F, SCM_BOOL_F); return mvec; |