From a64a9e0432fabe5e5029c19ffb71c0f864207a4f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 8 Mar 2012 12:51:17 +0000 Subject: [PATCH 3/7] account test: rename variables in macros to not shadow normal variables Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30422 --- tests/dbus/account.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/dbus/account.c b/tests/dbus/account.c index d33e097..7c268f3 100644 --- a/tests/dbus/account.c +++ b/tests/dbus/account.c @@ -308,31 +308,31 @@ account_prepare_cb (GObject *source, #define assert_strprop(self, prop, val) \ {\ - gchar *s; \ + gchar *_s; \ \ g_object_get (self, \ - prop, &s, \ + prop, &_s, \ NULL); \ - g_assert_cmpstr (s, ==, val);\ - g_free (s); \ + g_assert_cmpstr (_s, ==, val);\ + g_free (_s); \ } #define assert_uintprop(self, prop, val) \ {\ - guint u; \ + guint _u; \ \ g_object_get (self, \ - prop, &u, \ + prop, &_u, \ NULL); \ - g_assert_cmpuint (u, ==, val);\ + g_assert_cmpuint (_u, ==, val);\ } #define assert_boolprop(self, prop, val) \ {\ - gboolean b; \ + gboolean _b; \ \ g_object_get (self, \ - prop, &b, \ + prop, &_b, \ NULL); \ - g_assert_cmpint (b, ==, val);\ + g_assert_cmpint (_b, ==, val);\ } static void -- 1.7.9.1