|
raveit65 |
7ab079e |
From 5c0e73a27f524a38cfdc656583bfafa5f6a8edf3 Mon Sep 17 00:00:00 2001
|
|
raveit65 |
7ab079e |
From: rbuj <robert.buj@gmail.com>
|
|
raveit65 |
7ab079e |
Date: Mon, 3 Feb 2020 16:29:26 +0100
|
|
raveit65 |
7ab079e |
Subject: [PATCH] util: meta_bug raises SIGABRT so it shouldn't return
|
|
raveit65 |
7ab079e |
|
|
raveit65 |
7ab079e |
---
|
|
raveit65 |
7ab079e |
src/core/util.c | 2 +-
|
|
raveit65 |
7ab079e |
src/include/util.h | 2 +-
|
|
raveit65 |
7ab079e |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
raveit65 |
7ab079e |
|
|
raveit65 |
7ab079e |
diff --git a/src/core/util.c b/src/core/util.c
|
|
raveit65 |
7ab079e |
index 0602b28c..6ebaf3c9 100644
|
|
raveit65 |
7ab079e |
--- a/src/core/util.c
|
|
raveit65 |
7ab079e |
+++ b/src/core/util.c
|
|
raveit65 |
7ab079e |
@@ -363,7 +363,7 @@ meta_bug (const char *format, ...)
|
|
raveit65 |
7ab079e |
gchar *str;
|
|
raveit65 |
7ab079e |
FILE *out;
|
|
raveit65 |
7ab079e |
|
|
raveit65 |
7ab079e |
- g_return_if_fail (format != NULL);
|
|
raveit65 |
7ab079e |
+ g_assert (format != NULL);
|
|
raveit65 |
7ab079e |
|
|
raveit65 |
7ab079e |
va_start (args, format);
|
|
raveit65 |
7ab079e |
str = g_strdup_vprintf (format, args);
|
|
raveit65 |
7ab079e |
diff --git a/src/include/util.h b/src/include/util.h
|
|
raveit65 |
7ab079e |
index 107b9365..fe94bbc6 100644
|
|
raveit65 |
7ab079e |
--- a/src/include/util.h
|
|
raveit65 |
7ab079e |
+++ b/src/include/util.h
|
|
raveit65 |
7ab079e |
@@ -43,7 +43,7 @@ void meta_verbose_real (const char *format,
|
|
raveit65 |
7ab079e |
...) G_GNUC_PRINTF (1, 2);
|
|
raveit65 |
7ab079e |
|
|
raveit65 |
7ab079e |
void meta_bug (const char *format,
|
|
raveit65 |
7ab079e |
- ...) G_GNUC_PRINTF (1, 2);
|
|
raveit65 |
7ab079e |
+ ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN G_ANALYZER_NORETURN;
|
|
raveit65 |
7ab079e |
void meta_warning (const char *format,
|
|
raveit65 |
7ab079e |
...) G_GNUC_PRINTF (1, 2);
|
|
raveit65 |
7ab079e |
void meta_fatal (const char *format,
|
|
raveit65 |
7ab079e |
--
|
|
raveit65 |
7ab079e |
2.21.1
|
|
raveit65 |
7ab079e |
|