git.iko.soy/typeable/hexml
on master help sign in
Rework the assert statements, spotted by FlexeLint
226e10bNeil Mitchell
cbits/hexml.c+3−7
compare with master
unifiedsplit
@@ -14,7 +14,7 @@ static inline int end(str s) { return s.start + s.length; }
14
14
15static inline str start_length(int32_t start, int32_t length)
15static inline str start_length(int32_t start, int32_t length)
16{
16{
17− if (start < 0 || length < 0) assert(0);
17+ assert(start >= 0 && length >= 0);
18 str res;
18 str res;
19 res.start = start;
19 res.start = start;
20 res.length = length;
20 res.length = length;
@@ -87,16 +87,12 @@ static inline void render_char(render* r, char c)
87
87
88static inline void bound(const char* msg, int index, int mn, int mx)
88static inline void bound(const char* msg, int index, int mn, int mx)
89{
89{
90− if (index < mn || index > mx)
91− {
92− //printf("Bounds checking failed %s, got %i, which should be in %i:%i\n", msg, index, mn, mx);
93− assert(0);
90+ assert(index >= mn && index <= mx);
94− }
95}
91}
96
92
97static inline void bound_str(const char* msg, str s, int mn, int mx)
93static inline void bound_str(const char* msg, str s, int mn, int mx)
98{
94{
99− if (s.length < 0) assert(0);
95+ assert(s.length >= 0);
100 bound(msg, s.start, mn, mx);
96 bound(msg, s.start, mn, mx);
101 bound(msg, end(s), mn, mx);
97 bound(msg, end(s), mn, mx);
102}
98}