summaryrefslogtreecommitdiffstats
path: root/struct.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2022-01-06 20:03:25 -0800
committerKaz Kylheku <kaz@kylheku.com>2022-01-06 20:03:25 -0800
commit07a0d613fceaf12fd7bf2f900223ac925908c76e (patch)
tree7d8ded9098d1e715af35b5cc8b6e7ea97097f543 /struct.c
parent5983e14cf97bd1302151ffc3dbc53451acdc87e9 (diff)
downloadtxr-07a0d613fceaf12fd7bf2f900223ac925908c76e.tar.gz
txr-07a0d613fceaf12fd7bf2f900223ac925908c76e.tar.bz2
txr-07a0d613fceaf12fd7bf2f900223ac925908c76e.zip
Casts have crept into the code not wrapped by macros.
It is against TXR coding conventions to use the C cast notation. The usage creeps into the code. To find instances of this, we must compile using GNU g++, and add -Wold-style-cast via EXTRA_FLAGS. * eval.c (prof_call): Use macro instead of cast. * ffi.c (pad_retval, ffi_varray_alloc, make_ffi_type_union, carray_dup, carray_replace, uint_carray, int_carray, put_carray, fill_carray): Likewise. * itypes.c (c_i64, c_u64): Likewise. * lib.c (cyr, chk_xalloc, spilt_str_keep, vector, cobj_register): Likewise. * linenoise.c (record_undo): Likewise. Also, drop one superfluous cast: wstrdup_fn returns wchar_t *. (flash, edit_insert, edit_insert_str): Use macro instead of cast. * mpi/mpi.c (s_mp_ispow2d): Likewise. * parser.c (lino_getch): Likewise. * rand.c (make_random_state, random_buf): Likewise. * stream.c (generic_get_line, do_parse_mode): Likewise. * struct.c (get_duplicate_supers, call_initfun_chain, call_postinitfun_chain): Likewise. * sysif.c (c_time): Likewise. * tree.c (tr_insert): Likewise.
Diffstat (limited to 'struct.c')
-rw-r--r--struct.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/struct.c b/struct.c
index f2fb78a5..37d2439d 100644
--- a/struct.c
+++ b/struct.c
@@ -364,7 +364,7 @@ static val get_duplicate_supers(val supers, val self)
val super = us_car(iter);
struct struct_type *st = stype_handle(&super, self);
int pos = st->id % (sizeof bloom * CHAR_BIT);
- ucnum mask = (ucnum) 1 << pos;
+ ucnum mask = convert(ucnum, 1) << pos;
if ((mask & bloom) != 0) {
if (memq(super, all_supers) != iter && !memq(super, dup_supers)) {
@@ -709,7 +709,7 @@ static void call_initfun_chain(struct struct_type *st, val strct,
const int bits_ucnum = sizeof *seen * CHAR_BIT;
cnum index = i / bits_ucnum;
cnum bit = i % bits_ucnum;
- ucnum mask = (ucnum) 1 << bit;
+ ucnum mask = convert(ucnum, 1) << bit;
if ((seen[index] & mask) != 0)
return;
seen[index] |= mask;
@@ -736,7 +736,7 @@ static void call_postinitfun_chain(struct struct_type *st, val strct,
const int bits_ucnum = sizeof *seen * CHAR_BIT;
cnum index = i / bits_ucnum;
cnum bit = i % bits_ucnum;
- ucnum mask = (ucnum) 1 << bit;
+ ucnum mask = convert(ucnum, 1) << bit;
if ((seen[index] & mask) != 0)
return;
seen[index] |= mask;