diff options
| author | David Robillard <d@drobilla.net> | 2012-09-08 17:21:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-09-08 17:21:50 +0000 |
| commit | 3f2868e1e5299f8f9258a9a82907b75a93a666bf (patch) | |
| tree | 70d1afd1cabb7aebc5744d74b4ba624f4e0c1dba | |
| parent | 386b00b4ba02b9a0b33e31848bc81eabbd44af68 (diff) | |
| download | lv2-3f2868e1e5299f8f9258a9a82907b75a93a666bf.tar.xz | |
Remove asserts from event-helper.h.
| -rw-r--r-- | lv2/lv2plug.in/ns/ext/event/event-helpers.h | 9 | ||||
| -rw-r--r-- | lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lv2/lv2plug.in/ns/ext/event/event-helpers.h b/lv2/lv2plug.in/ns/ext/event/event-helpers.h index fcd13fe..0fe2d79 100644 --- a/lv2/lv2plug.in/ns/ext/event/event-helpers.h +++ b/lv2/lv2plug.in/ns/ext/event/event-helpers.h @@ -22,7 +22,6 @@ #ifndef LV2_EVENT_HELPERS_H #define LV2_EVENT_HELPERS_H -#include <assert.h> #include <stdint.h> #include <stdlib.h> #include <string.h> @@ -124,7 +123,9 @@ lv2_event_is_valid(LV2_Event_Iterator* iter) static inline bool lv2_event_increment(LV2_Event_Iterator* iter) { - assert(lv2_event_is_valid(iter)); + if (!lv2_event_is_valid(iter)) { + return false; + } LV2_Event* const ev = (LV2_Event*)( (uint8_t*)iter->buf->data + iter->offset); @@ -146,7 +147,9 @@ static inline LV2_Event* lv2_event_get(LV2_Event_Iterator* iter, uint8_t** data) { - assert(lv2_event_is_valid(iter)); + if (!lv2_event_is_valid(iter)) { + return false; + } LV2_Event* const ev = (LV2_Event*)( (uint8_t*)iter->buf->data + iter->offset); diff --git a/lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl b/lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl index 6dd546f..f811514 100644 --- a/lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl +++ b/lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl @@ -20,6 +20,8 @@ dcs:item [ rdfs:label "Make event iterator gracefully handle optional ports." ] , [ + rdfs:label "Remove asserts from event-helper.h." + ] , [ rdfs:label "Use more precise domain and range for EventPort properties." ] , [ rdfs:label "Use consistent label style." |