[Spice-devel] [spice-common 6/7] log: Introduce spice_assert_if_fail

Christophe Fergeau cfergeau at redhat.com
Fri Nov 27 07:47:05 PST 2015


They can be used in spice-server to replace spice_return_if_fail.
Currently spice_return_if_fail aborts in spice-server, and it's not
always clear whether using a non-aborting g_return_if_fail is acceptable
or not. Having a spice_assert_if_fail alternative makes it clearer that
this is not going to return, while having a name distinct from assert()
so that places which needs reviewing can be spotted more easily.
---
 common/log.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/log.h b/common/log.h
index 2731582..411acf1 100644
--- a/common/log.h
+++ b/common/log.h
@@ -95,7 +95,10 @@ void spice_log(const char *log_domain,
     }                                                   \
 } G_STMT_END
 
-#define spice_assert(x) G_STMT_START {              \
+#define spice_assert_val_if_fail(cond, val) spice_assert(cond)
+#define spice_assert_if_fail(cond) spice_assert(cond)
+
+#define spice_assert(x) G_STMT_START {                  \
     if SPICE_LIKELY(x) { } else {                       \
         spice_error("assertion `%s' failed", #x);       \
     }                                                   \
-- 
2.5.0



More information about the Spice-devel mailing list