From 672e5d8fa6a998a76c8d0486662e823c590be956 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 12 Oct 2016 17:38:02 +0200
Subject: [PATCH] improve asserts

---
 spa/include/spa/defs.h         | 18 ++++++------------
 spa/plugins/v4l2/v4l2-source.c | 15 ++++-----------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/spa/include/spa/defs.h b/spa/include/spa/defs.h
index e1ee41d61..ca56dc9b6 100644
--- a/spa/include/spa/defs.h
+++ b/spa/include/spa/defs.h
@@ -127,30 +127,24 @@ typedef void (*SpaNotify) (void *data);
 #endif
 
 
-#define spa_return_if_fail (log, expr)                                  \
+#define spa_return_if_fail(expr)                                        \
     do {                                                                \
-        if (SPA_UNLIKELY (!(expr))) {                                   \
-            spa_log_debug(log, "Assertion '%s' failed\n", #expr);	\
+        if (SPA_UNLIKELY (!(expr)))                                     \
             return;                                                     \
-        }                                                               \
     } while(false)
 
-#define spa_return_val_if_fail (log, expr, val)                         \
+#define spa_return_val_if_fail(expr, val)                               \
     do {                                                                \
-        if (SPA_UNLIKELY(!(expr))) {                                    \
-            spa_log_debug (log, "Assertion '%s' failed\n", #expr);      \
+        if (SPA_UNLIKELY(!(expr)))                                      \
             return (val);                                               \
-        }                                                               \
     } while(false)
 
 /* spa_assert_se() is an assert which guarantees side effects of x,
  * i.e. is never optimized away, regardless of NDEBUG or FASTPATH. */
-#define spa_assert_se (expr)                                            \
+#define spa_assert_se(expr)                                             \
     do {                                                                \
-        if (SPA_UNLIKELY(!(expr))) {                                    \
-            spa_log_error("Assertion '%s' failed, Aborting\n.", #expr); \
+        if (SPA_UNLIKELY(!(expr)))                                      \
             abort();                                                    \
-        }                                                               \
     } while (false)
 
 /* Does exactly nothing */
diff --git a/spa/plugins/v4l2/v4l2-source.c b/spa/plugins/v4l2/v4l2-source.c
index a5584451d..9eef2646e 100644
--- a/spa/plugins/v4l2/v4l2-source.c
+++ b/spa/plugins/v4l2/v4l2-source.c
@@ -699,21 +699,14 @@ spa_v4l2_source_node_port_reuse_buffer (SpaNode         *node,
   SpaV4l2State *state;
   SpaResult res;
 
-  if (node == NULL)
-    return SPA_RESULT_INVALID_ARGUMENTS;
+  spa_return_val_if_fail (node != NULL, SPA_RESULT_INVALID_ARGUMENTS);
+  spa_return_val_if_fail (port_id == 0, SPA_RESULT_INVALID_PORT);
 
   this = SPA_CONTAINER_OF (node, SpaV4l2Source, node);
-
-  if (port_id != 0)
-    return SPA_RESULT_INVALID_PORT;
-
   state = &this->state[port_id];
 
-  if (state->n_buffers == 0)
-    return SPA_RESULT_NO_BUFFERS;
-
-  if (buffer_id >= state->n_buffers)
-    return SPA_RESULT_INVALID_BUFFER_ID;
+  spa_return_val_if_fail (state->n_buffers > 0, SPA_RESULT_NO_BUFFERS);
+  spa_return_val_if_fail (buffer_id < state->n_buffers, SPA_RESULT_INVALID_BUFFER_ID);
 
   res = spa_v4l2_buffer_recycle (this, buffer_id);