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/extensions.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/extensions.c')
| -rw-r--r-- | libguile/extensions.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libguile/extensions.c b/libguile/extensions.c index c285b1109..a094159d4 100644 --- a/libguile/extensions.c +++ b/libguile/extensions.c @@ -1,6 +1,4 @@ -/* extensions.c - registering and loading extensions. - - Copyright 2001,2006,2009-2011,2018 +/* Copyright 2001,2002,2004,2006,2009-2011,2018-2019 Free Software Foundation, Inc. This file is part of Guile. @@ -93,9 +91,9 @@ load_extension (SCM lib, SCM init) scm_dynwind_begin (0); - clib = scm_to_locale_string (lib); + clib = scm_to_utf8_string (lib); scm_dynwind_free (clib); - cinit = scm_to_locale_string (init); + cinit = scm_to_utf8_string (init); scm_dynwind_free (cinit); for (ext = head; ext; ext = ext->next) @@ -126,7 +124,7 @@ load_extension (SCM lib, SCM init) void scm_c_load_extension (const char *lib, const char *init) { - load_extension (scm_from_locale_string (lib), scm_from_locale_string (init)); + load_extension (scm_from_utf8_string (lib), scm_from_utf8_string (init)); } SCM_DEFINE (scm_load_extension, "load-extension", 2, 0, 0, |