Re: [Qemu-devel] [PATCH v2 05/30] glib-compat: add g_test_add_data_func_full fallback

[Eric Blake]

On 02/21/2017 08:14 AM, Marc-André Lureau wrote:
> Move the fallback from qtest_add_data_func_full() to glib-compat.
> 
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  include/glib-compat.h | 21 +++++++++++++++++++++
>  tests/libqtest.c      | 10 ----------
>  2 files changed, 21 insertions(+), 10 deletions(-)

Reviewed-by: Eric Blake <address@hidden>

> 
> diff --git a/include/glib-compat.h b/include/glib-compat.h
> index 0cd24ffbe9..863c8cf73d 100644
> --- a/include/glib-compat.h
> +++ b/include/glib-compat.h
> @@ -328,4 +328,25 @@ static inline void g_source_set_name_by_id(guint tag, 
> const char *name)
>  #define g_test_subprocess() (0)
>  #endif
>  
> +
> +#if !GLIB_CHECK_VERSION(2, 34, 0)
> +static inline void
> +g_test_add_data_func_full(const char *path,
> +                          gpointer data,
> +                          gpointer fn,
> +                          gpointer data_free_func)
> +{
> +#if GLIB_CHECK_VERSION(2, 26, 0)
> +    /* back-compat casts, remove this once we can require new-enough glib */
> +    g_test_add_vtable(path, 0, data, NULL,
> +                      (GTestFixtureFunc)fn, (GTestFixtureFunc) 
> data_free_func);
> +#else
> +    /* back-compat casts, remove this once we can require new-enough glib */

The comments are somewhat dead here, since they are guarded by
GLIB_CHECK_VERSION that states what the new-enough glib is (and the
older versions won't be changing).

>      gchar *path = g_strdup_printf("/%s/%s", qtest_get_arch(), str);
> -#if GLIB_CHECK_VERSION(2, 34, 0)
>      g_test_add_data_func_full(path, data, fn, data_free_func);
> -#elif GLIB_CHECK_VERSION(2, 26, 0)
> -    /* back-compat casts, remove this once we can require new-enough glib */
> -    g_test_add_vtable(path, 0, data, NULL,
> -                      (GTestFixtureFunc)fn, (GTestFixtureFunc) 
> data_free_func);
> -#else
> -    /* back-compat casts, remove this once we can require new-enough glib */

But since it is code motion, I don't care if you keep or remove the
comments.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature