mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-15 08:10:17 +02:00
Code Activity

Use 'scm_from_utf8_{string,symbol,keyword}' for C string literals.

Browse source 
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.
This commit is contained in:
Mark H Weaver 2018-10-16 02:34:18 -04:00
parent 3845343cf3
commit c2a654b7d2
22 changed files with 115 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libguile/error.c
View file

@ -1,5 +1,5 @@
/* Copyright (C) 1995-1998, 2000, 2001, 2004, 2006, 2010, 2012-2014
* Free Software Foundation, Inc.
/* Copyright (C) 1995-1998, 2000, 2001, 2004, 2006, 2010, 2012-2016,
* 2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@ -58,8 +58,8 @@ scm_error (SCM key, const char *subr, const char *message, SCM args, SCM rest)
{
scm_error_scm
(key,
(subr == NULL) ? SCM_BOOL_F : scm_from_locale_string (subr),
(message == NULL) ? SCM_BOOL_F : scm_from_locale_string (message),
(subr == NULL) ? SCM_BOOL_F : scm_from_utf8_string (subr),
(message == NULL) ? SCM_BOOL_F : scm_from_utf8_string (message),
args, rest);
}
@ -239,7 +239,7 @@ scm_error_num_args_subr (const char *subr)
scm_error (scm_args_number_key,
NULL,
"Wrong number of arguments to ~A",
scm_list_1 (scm_from_locale_string (subr)),
scm_list_1 (scm_from_utf8_string (subr)),
SCM_BOOL_F);
}
@ -262,8 +262,8 @@ scm_i_wrong_type_arg_symbol (SCM symbol, int pos, SCM bad_value)
{
scm_error_scm (scm_arg_type_key,
scm_symbol_to_string (symbol),
(pos == 0) ? scm_from_locale_string ("Wrong type: ~S")
: scm_from_locale_string ("Wrong type argument in position ~A: ~S"),
(pos == 0) ? scm_from_utf8_string ("Wrong type: ~S")
: scm_from_utf8_string ("Wrong type argument in position ~A: ~S"),
(pos == 0) ? scm_list_1 (bad_value)
: scm_list_2 (scm_from_int (pos), bad_value),
scm_list_1 (bad_value));
@ -273,7 +273,7 @@ scm_i_wrong_type_arg_symbol (SCM symbol, int pos, SCM bad_value)
void
scm_wrong_type_arg_msg (const char *subr, int pos, SCM bad_value, const char *szMessage)
{
SCM msg = scm_from_locale_string (szMessage);
SCM msg = scm_from_utf8_string (szMessage);
if (pos == 0)
{
scm_error (scm_arg_type_key,