diff options
| author | Eric Wong <e@80x24.org> | 2015-01-10 11:04:53 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2015-01-10 11:07:26 +0000 |
| commit | c02e79d8686ec9c857e6e3d56a067cc8db7c682b (patch) | |
| tree | 31d49e3124c6377e460488f6b217b541c763b5f7 | |
| parent | 14e47569804a5c517baafac5e3539b81a61cc017 (diff) | |
| download | kgio-c02e79d8686ec9c857e6e3d56a067cc8db7c682b.tar.gz | |
Define a MY_ARY_SUBSEQ macro which checks arg counts correctly and avoids throwing off people who may potentially want to debug this code.
| -rw-r--r-- | ext/kgio/writev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/kgio/writev.c b/ext/kgio/writev.c index 9c1ca15..027cdb5 100644 --- a/ext/kgio/writev.c +++ b/ext/kgio/writev.c @@ -27,7 +27,9 @@ static inline VALUE my_ary_subseq(VALUE ary, long idx, long len) return rb_ary_aref(2, args, ary); } -#define rb_ary_subseq my_ary_subseq +#define MY_ARY_SUBSEQ(ary,idx,len) my_ary_subseq((ary),(idx),(len)) +#else +#define MY_ARY_SUBSEQ(ary,idx,len) rb_ary_subseq((ary),(idx),(len)) #endif static VALUE sym_wait_writable; @@ -105,7 +107,7 @@ static void prepare_writev(struct wrv_args *a, VALUE io, VALUE ary) if (TYPE(ary) == T_ARRAY) /* rb_ary_subseq will not copy array unless it modified */ - a->buf = rb_ary_subseq(ary, 0, RARRAY_LEN(ary)); + a->buf = MY_ARY_SUBSEQ(ary, 0, RARRAY_LEN(ary)); else a->buf = rb_Array(ary); @@ -188,7 +190,7 @@ static long trim_writev_buffer(struct wrv_args *a, ssize_t n) /* partially done, remove fully-written buffers */ if (i > 0) - a->buf = rb_ary_subseq(a->buf, i, ary_len - i); + a->buf = MY_ARY_SUBSEQ(a->buf, i, ary_len - i); /* setup+replace partially written buffer */ if (n < 0) { |