[Qemu-devel] [PATCH] glib-compat.h: change assert to g_assert

[Qemu-devel] [PATCH] glib-compat.h: change assert to g_assert

[Michael Tokarev]

include/glib-compat.h defines a bunch of functions based on glib primitives,
and uses assert() without including assert.h.  Replace assert() with
g_assert() to make the file more self-contained, and to fix compilation
breakage after 28507a415a9b1e.

Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 include/glib-compat.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/glib-compat.h b/include/glib-compat.h
index 011352b..28d9f15 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -115,7 +115,7 @@ static inline void g_mutex_init(CompatGMutex *mutex)
 
 static inline void g_mutex_clear(CompatGMutex *mutex)
 {
-    assert(mutex->once.status != G_ONCE_STATUS_PROGRESS);
+    g_assert(mutex->once.status != G_ONCE_STATUS_PROGRESS);
     if (mutex->once.retval) {
         g_mutex_free((GMutex *) mutex->once.retval);
     }
@@ -155,7 +155,7 @@ static inline void g_cond_init(CompatGCond *cond)
 
 static inline void g_cond_clear(CompatGCond *cond)
 {
-    assert(cond->once.status != G_ONCE_STATUS_PROGRESS);
+    g_assert(cond->once.status != G_ONCE_STATUS_PROGRESS);
     if (cond->once.retval) {
         g_cond_free((GCond *) cond->once.retval);
     }
@@ -164,7 +164,7 @@ static inline void g_cond_clear(CompatGCond *cond)
 
 static inline void (g_cond_wait)(CompatGCond *cond, CompatGMutex *mutex)
 {
-    assert(mutex->once.status != G_ONCE_STATUS_PROGRESS);
+    g_assert(mutex->once.status != G_ONCE_STATUS_PROGRESS);
     g_once(&cond->once, do_g_cond_new, NULL);
     g_cond_wait((GCond *) cond->once.retval, (GMutex *) mutex->once.retval);
 }
-- 
2.1.4

Re: [Qemu-devel] [PATCH] glib-compat.h: change assert to g_assert

[Laurent Desnogues]

Hello,

On Thu, May 7, 2015 at 12:41 PM, Michael Tokarev <mjt@tls.msk.ru> wrote:
> include/glib-compat.h defines a bunch of functions based on glib primitives,
> and uses assert() without including assert.h.  Replace assert() with
> g_assert() to make the file more self-contained, and to fix compilation
> breakage after 28507a415a9b1e.
>
> Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

Tested-by: Laurent Desnogues <laurent.desnogues@gmail.com>

Thanks,

Laurent

> ---
>  include/glib-compat.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/glib-compat.h b/include/glib-compat.h
> index 011352b..28d9f15 100644
> --- a/include/glib-compat.h
> +++ b/include/glib-compat.h
> @@ -115,7 +115,7 @@ static inline void g_mutex_init(CompatGMutex *mutex)
>
>  static inline void g_mutex_clear(CompatGMutex *mutex)
>  {
> -    assert(mutex->once.status != G_ONCE_STATUS_PROGRESS);
> +    g_assert(mutex->once.status != G_ONCE_STATUS_PROGRESS);
>      if (mutex->once.retval) {
>          g_mutex_free((GMutex *) mutex->once.retval);
>      }
> @@ -155,7 +155,7 @@ static inline void g_cond_init(CompatGCond *cond)
>
>  static inline void g_cond_clear(CompatGCond *cond)
>  {
> -    assert(cond->once.status != G_ONCE_STATUS_PROGRESS);
> +    g_assert(cond->once.status != G_ONCE_STATUS_PROGRESS);
>      if (cond->once.retval) {
>          g_cond_free((GCond *) cond->once.retval);
>      }
> @@ -164,7 +164,7 @@ static inline void g_cond_clear(CompatGCond *cond)
>
>  static inline void (g_cond_wait)(CompatGCond *cond, CompatGMutex *mutex)
>  {
> -    assert(mutex->once.status != G_ONCE_STATUS_PROGRESS);
> +    g_assert(mutex->once.status != G_ONCE_STATUS_PROGRESS);
>      g_once(&cond->once, do_g_cond_new, NULL);
>      g_cond_wait((GCond *) cond->once.retval, (GMutex *) mutex->once.retval);
>  }
> --
> 2.1.4
>
>