summaryrefslogtreecommitdiff
path: root/libguile/debug-malloc.c
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-10-16 02:34:18 -0400
committerAndy Wingo <wingo@pobox.com>2019-05-23 16:41:53 +0200
commit3ae69f30632dba1677d2ed822297cf4599a8d9dd (patch)
tree4f5d8efb70eb1afeccda49f60e5dcf919d48232a /libguile/debug-malloc.c
parenta47a5e6828432fb80c82ce002553f59c6447b911 (diff)
downloadguile-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/debug-malloc.c')
-rw-r--r--libguile/debug-malloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c
index ec684bc1d..ac8bf710a 100644
--- a/libguile/debug-malloc.c
+++ b/libguile/debug-malloc.c
@@ -1,4 +1,4 @@
-/* Copyright 2000,2006,2008,2018
+/* Copyright 2000-2002,2004,2006,2008-2009,2018-2019
Free Software Foundation, Inc.
This file is part of Guile.
@@ -224,7 +224,7 @@ SCM_DEFINE (scm_malloc_stats, "malloc-stats", 0, 0, 0,
int i;
for (i = 0; i < malloc_type_size + N_SEEK; ++i)
if (malloc_type[i].key)
- res = scm_acons (scm_from_locale_string ((char *) malloc_type[i].key),
+ res = scm_acons (scm_from_utf8_string ((char *) malloc_type[i].key),
scm_from_int ((int) malloc_type[i].data),
res);
return res;