diff options
| author | Gareth Rees | 2013-05-29 12:19:19 +0100 |
|---|---|---|
| committer | Gareth Rees | 2013-05-29 12:19:19 +0100 |
| commit | 87019f4ee25a7724c5ed483a40b0b39d46cf9ee8 (patch) | |
| tree | 8b32b03548df4e22d43f30c7164ebaf0bce4b33b /mps/code/range.c | |
| parent | 2be56a898f14d6d8a181642e9c0cc5edada1b9a4 (diff) | |
| download | emacs-87019f4ee25a7724c5ed483a40b0b39d46cf9ee8.tar.gz emacs-87019f4ee25a7724c5ed483a40b0b39d46cf9ee8.zip | |
Fix review comments from <https://info.ravenbrook.com/mail/2013/05/28/22-21-11/0/>:
* Rename RangeOverlap to RangesOverlap.
* MVFF shouldn't assume that CBSInsert and CBSDelete can't fail.
* Remove unused function mps_mvff_stat.
* Don't call range methods in RangeCheck.
* RangeInit can't fail, so return void.
Copied from Perforce
Change: 182297
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code/range.c')
| -rw-r--r-- | mps/code/range.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mps/code/range.c b/mps/code/range.c index 739b11f5b5e..60a8b0da367 100644 --- a/mps/code/range.c +++ b/mps/code/range.c | |||
| @@ -16,14 +16,13 @@ SRCID(range, "$Id$"); | |||
| 16 | Bool RangeCheck(Range range) | 16 | Bool RangeCheck(Range range) |
| 17 | { | 17 | { |
| 18 | CHECKS(Range, range); | 18 | CHECKS(Range, range); |
| 19 | CHECKL(range != NULL); | 19 | CHECKL(range->base != NULL); |
| 20 | CHECKL(RangeBase(range) != NULL); | 20 | CHECKL(range->base <= range->limit); |
| 21 | CHECKL(RangeBase(range) <= RangeLimit(range)); | ||
| 22 | 21 | ||
| 23 | return TRUE; | 22 | return TRUE; |
| 24 | } | 23 | } |
| 25 | 24 | ||
| 26 | Res RangeInit(Range range, Addr base, Addr limit) | 25 | void RangeInit(Range range, Addr base, Addr limit) |
| 27 | { | 26 | { |
| 28 | AVER(range != NULL); | 27 | AVER(range != NULL); |
| 29 | AVER(base != NULL); | 28 | AVER(base != NULL); |
| @@ -34,7 +33,6 @@ Res RangeInit(Range range, Addr base, Addr limit) | |||
| 34 | 33 | ||
| 35 | range->sig = RangeSig; | 34 | range->sig = RangeSig; |
| 36 | AVERT(Range, range); | 35 | AVERT(Range, range); |
| 37 | return ResOK; | ||
| 38 | } | 36 | } |
| 39 | 37 | ||
| 40 | void RangeFinish(Range range) | 38 | void RangeFinish(Range range) |
| @@ -64,7 +62,7 @@ Res RangeDescribe(Range range, mps_lib_FILE *stream) | |||
| 64 | return ResOK; | 62 | return ResOK; |
| 65 | } | 63 | } |
| 66 | 64 | ||
| 67 | Bool RangeOverlap(Range range1, Range range2) | 65 | Bool RangesOverlap(Range range1, Range range2) |
| 68 | { | 66 | { |
| 69 | AVERT(Range, range1); | 67 | AVERT(Range, range1); |
| 70 | AVERT(Range, range2); | 68 | AVERT(Range, range2); |