summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2021-06-01 20:56:34 -0700
committerKaz Kylheku <kaz@kylheku.com>2021-06-01 20:56:34 -0700
commit89f85fd0fc4001088aa2ad4b795b1562702a8fee (patch)
treee10a62def9c7bd015a41eb432c7a4482a07e1916
parent91a829beb997a8338c19bb12a1f82f8fe977c724 (diff)
downloadtxr-89f85fd0fc4001088aa2ad4b795b1562702a8fee.tar.gz
txr-89f85fd0fc4001088aa2ad4b795b1562702a8fee.tar.bz2
txr-89f85fd0fc4001088aa2ad4b795b1562702a8fee.zip
Pre-release C++ upkeep.
* stream.c (mkdtemp_wrap): Rename template argument to prefix, because template is a C++ keyword. (mkstemp_wrap): Rename local variable from template to templ. * stream.h (mkdtemp_wrap): Rename template argument.
-rw-r--r--stream.c8
-rw-r--r--stream.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/stream.c b/stream.c
index 2fdd5e0d..95480a70 100644
--- a/stream.c
+++ b/stream.c
@@ -4956,9 +4956,9 @@ val tmpfile_wrap(void)
#if HAVE_MKSTEMP
-val mkdtemp_wrap(val template)
+val mkdtemp_wrap(val prefix)
{
- char *tmpl = utf8_dup_to(c_str(scat2(template, lit("XXXXXX"))));
+ char *tmpl = utf8_dup_to(c_str(scat2(prefix, lit("XXXXXX"))));
if (mkdtemp(tmpl) != 0) {
val ret = string_utf8(tmpl);
@@ -4975,9 +4975,9 @@ val mkstemp_wrap(val prefix, val suffix)
{
val self = lit("mkstemp");
val suff = default_arg(suffix, null_string);
- val template = scat3(prefix, lit("XXXXXX"), suff);
+ val templ = scat3(prefix, lit("XXXXXX"), suff);
cnum slen = c_num(length(suff), self);
- char *tmpl = utf8_dup_to(c_str(template));
+ char *tmpl = utf8_dup_to(c_str(templ));
val name;
int fd;
diff --git a/stream.h b/stream.h
index cdfe9d8c..adf7cb7e 100644
--- a/stream.h
+++ b/stream.h
@@ -252,6 +252,6 @@ val iobuf_get(void);
void iobuf_put(val buf);
void iobuf_list_empty(void);
val tmpfile_wrap(void);
-val mkdtemp_wrap(val template);
+val mkdtemp_wrap(val prefix);
val mkstemp_wrap(val prefix, val suffix);
void stream_init(void);