diff --git a/include/crucible/error.h b/include/crucible/error.h index 0b57869..170b5ba 100644 --- a/include/crucible/error.h +++ b/include/crucible/error.h @@ -100,12 +100,6 @@ namespace crucible { } while (0) // macros for checking a constraint -#define CHECK_CONSTRAINT(value, expr) do { \ - if (!(expr)) { \ - THROW_ERROR(out_of_range, #value << " = " << value << " failed constraint check (" << #expr << ")"); \ - } \ -} while(0) - #define THROW_CHECK0(type, expr) do { \ if (!(expr)) { \ THROW_ERROR(type, "failed constraint check (" << #expr << ")"); \ diff --git a/lib/fs.cc b/lib/fs.cc index 366934f..5e49544 100644 --- a/lib/fs.cc +++ b/lib/fs.cc @@ -625,7 +625,7 @@ namespace crucible { void Fiemap::do_ioctl(int fd) { - CHECK_CONSTRAINT(m_min_count, m_min_count <= m_max_count); + THROW_CHECK1(out_of_range, m_min_count, m_min_count <= m_max_count); auto extent_count = m_min_count; vector ioctl_arg = vector_copy_struct(this);