From 96c653265f8673d79c84056df5892cda332511dc Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 3 Oct 2018 14:45:12 +0100 Subject: [PATCH] gmessages: Reformat g_return_*if_fail() macros to fix whitespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’m fed up of trying to read these and having my head done in by mixed tabs and spaces. This introduces no functional changes. Signed-off-by: Philip Withnall --- glib/gmessages.h | 76 ++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/glib/gmessages.h b/glib/gmessages.h index cebdc1659..c609d087f 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -581,41 +581,53 @@ GPrintFunc g_set_printerr_handler (GPrintFunc func); #else /* !G_DISABLE_CHECKS */ -#define g_return_if_fail(expr) G_STMT_START{ \ - if G_LIKELY(expr) { } else \ - { \ - g_return_if_fail_warning (G_LOG_DOMAIN, \ - G_STRFUNC, \ - #expr); \ - return; \ - }; }G_STMT_END +#define g_return_if_fail(expr) \ + G_STMT_START { \ + if (G_LIKELY (expr)) \ + { } \ + else \ + { \ + g_return_if_fail_warning (G_LOG_DOMAIN, \ + G_STRFUNC, \ + #expr); \ + return; \ + } \ + } G_STMT_END -#define g_return_val_if_fail(expr,val) G_STMT_START{ \ - if G_LIKELY(expr) { } else \ - { \ - g_return_if_fail_warning (G_LOG_DOMAIN, \ - G_STRFUNC, \ - #expr); \ - return (val); \ - }; }G_STMT_END +#define g_return_val_if_fail(expr, val) \ + G_STMT_START { \ + if (G_LIKELY (expr)) \ + { } \ + else \ + { \ + g_return_if_fail_warning (G_LOG_DOMAIN, \ + G_STRFUNC, \ + #expr); \ + return (val); \ + } \ + } G_STMT_END -#define g_return_if_reached() G_STMT_START{ \ - g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): should not be reached", \ - __FILE__, \ - __LINE__, \ - G_STRFUNC); \ - return; }G_STMT_END +#define g_return_if_reached() \ + G_STMT_START { \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): should not be reached", \ + __FILE__, \ + __LINE__, \ + G_STRFUNC); \ + return; \ + } G_STMT_END -#define g_return_val_if_reached(val) G_STMT_START{ \ - g_log (G_LOG_DOMAIN, \ - G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): should not be reached", \ - __FILE__, \ - __LINE__, \ - G_STRFUNC); \ - return (val); }G_STMT_END +#define g_return_val_if_reached(val) \ + G_STMT_START { \ + g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_CRITICAL, \ + "file %s: line %d (%s): should not be reached", \ + __FILE__, \ + __LINE__, \ + G_STRFUNC); \ + return (val); \ + } G_STMT_END #endif /* !G_DISABLE_CHECKS */