table: use sl_offsetof instead of doing arithmetic with sizeof

Sigrid Solveig Haflínudóttir committed 4 months ago

Commit b7cbfee1 parent bfd54071 file · +2 −4Browse files

Unified · Split

 #include "print.h"
 #include "table.h"
-#define inline_space sizeof(((sl_htable*)nil)->_space)
 static const sl_type *sl_tabletype;
 sl_nonnull(2)
 	if(cnt <= HT_N_INLINE)
 		nt = cvalue_nofinalizer(sl_tabletype, sizeof(sl_htable));
 	else
-		nt = cvalue(sl_tabletype, sizeof(sl_htable)-inline_space);
+		nt = cvalue(sl_tabletype, sl_offsetof(sl_htable, _space));
 	sl_htable *h = cvalue_data(nt);
 	htable_new(h, cnt/2);
 	sl_v k = sl_nil, arg;
 	if(table0 == &h->_space[0] && h->table != &h->_space[0]){
 		sl_cv *cv = ptr(sl_cv, args[0]);
 		add_finalizer(cv);
-		cv->len = sizeof(sl_htable) - inline_space;
+		cv->len = sl_offsetof(sl_htable, _space);
 	}
 	return args[0];
 }

Keyboard shortcuts