Attachment 56984 Details for Bug 37286 – Turn the non-valgrind code path into inline functions to avoid compiler warnings

[patch] Turn the non-valgrind code path into inline functions to avoid compiler warnings

0001-Turn-the-non-valgrind-code-path-into-inline-function.patch (text/plain), 1.57 KB, created by Simon McVittie on 2012-02-13 11:37:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-02-13 11:37:34 UTC

Size: 1.57 KB

patch

obsolete

>From 981dcf4f0cf6f4df64b12664abf51fc4881ee7d3 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 13 Feb 2012 19:35:55 +0000
>Subject: [PATCH] Turn the non-valgrind code path into inline functions to
> avoid compiler warnings
>
>Recent gcc will warn if you have a statement that's just a macro
>expanding to (0), but not if you have an inline stub function that
>always returns 0, so let's do the latter.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37286
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> dbus/dbus-valgrind-internal.h |   23 ++++++++++++++++++++---
> 1 files changed, 20 insertions(+), 3 deletions(-)
>
>diff --git a/dbus/dbus-valgrind-internal.h b/dbus/dbus-valgrind-internal.h
>index 4c972c5..c679345 100644
>--- a/dbus/dbus-valgrind-internal.h
>+++ b/dbus/dbus-valgrind-internal.h
>@@ -36,10 +36,27 @@
> #   define VALGRIND_DESTROY_MEMPOOL(_1) /* nothing */
> #   define VALGRIND_MEMPOOL_ALLOC(_1, _2, _3) /* nothing */
> #   define VALGRIND_MEMPOOL_FREE(_1, _2) /* nothing */
>-#   define VALGRIND_MAKE_MEM_UNDEFINED(_1, _2) (0)
> 
>-#   define VALGRIND_PRINTF(...) (0)
>-#   define VALGRIND_PRINTF_BACKTRACE(...) (0)
>+static inline int
>+VALGRIND_MAKE_MEM_UNDEFINED (void   *addr,
>+                             size_t  len)
>+{
>+  return 0;
>+}
>+
>+static inline int
>+VALGRIND_PRINTF (const char *format,
>+                 ...)
>+{
>+  return 0;
>+}
>+
>+static inline int
>+VALGRIND_PRINTF_BACKTRACE (const char *format,
>+                           ...)
>+{
>+  return 0;
>+}
> 
> #   define RUNNING_ON_VALGRIND 0
> #endif /* WITH_VALGRIND */
>-- 
>1.7.9
>

Actions: View | Splinter Review

Attachments on bug 37286: 46808 | 46809 | 46810 | 46811 | 46812 | 46813 | 46814 | 48344 | 48345 | 48346 | 48347 | 51336 | 51337 | 51339 | 51340 | 51341 | 51342 | 51343 | 51344 | 56984

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.