diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | glob.c | 2 | ||||
| -rw-r--r-- | stream.c | 2 | ||||
| -rw-r--r-- | sysif.c | 6 |
4 files changed, 16 insertions, 5 deletions
@@ -1,5 +1,16 @@ 2015-08-07 Kaz Kylheku <kaz@kylheku.com> + C++ upkeep: conversions, clashes, warnings. + + * glob.c (glob_wrap): Fix signed/unsigned comparison. + + * stream.c (make_null_stream): Fix convert beign used + where coerce is needed. + + * sysif.c (dup_wrap): Fix use of C++ new keyword. + +2015-08-07 Kaz Kylheku <kaz@kylheku.com> + C++ static forward issue. * lib.h (static_forward, static_def): New macros @@ -60,7 +60,7 @@ val glob_wrap(val pattern, val flags, val errfunc) s_errfunc ? errfunc_thunk : 0, &gl); { - int i; + size_t i; list_collect_decl (out, ptail); for (i = 0; i < gl.gl_pathc; i++) @@ -285,7 +285,7 @@ val make_null_stream(void) { struct strm_base *s = coerce(struct strm_base *, chk_malloc(sizeof *s)); strm_base_init(s); - return cobj(convert(mem_t *, s), stream_s, &null_ops.cobj_ops); + return cobj(coerce(mem_t *, s), stream_s, &null_ops.cobj_ops); } struct stdio_handle { @@ -473,11 +473,11 @@ static val wifcontinued(val status) } #endif -static val dup_wrap(val old, val new) +static val dup_wrap(val old, val neu) { - if (missingp(new)) + if (missingp(neu)) return num(dup(c_num(old))); - return num(dup2(c_num(old), c_num(new))); + return num(dup2(c_num(old), c_num(neu))); } static val exec_wrap(val file, val args_opt) |