luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rewriting the G_GNUC_NORETURN into G_NORETURN macros everywhere

Browse Source
This commit is contained in:
Emmanuel Fleury 2019-09-03 19:43:41 +02:00 committed by Philip Withnall
parent c1d74e35c1
commit 76426c0158
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/proxy.c
View File

@ -37,7 +37,7 @@ static const gchar *info = NULL;
static GCancellable *cancellable = NULL;
static gint return_value = 0;
static void G_GNUC_NORETURN
static G_NORETURN void
usage (void)
{
fprintf (stderr, "Usage: proxy [-s] (uri|host:port|ip:port|path|srv/protocol/domain)\n");

2
gio/tests/resolver.c
View File

@ -40,7 +40,7 @@ static gboolean synchronous = FALSE;
static guint connectable_count = 0;
static GResolverRecordType record_type = 0;
static void G_GNUC_NORETURN
static G_NORETURN void
usage (void)
{
fprintf (stderr, "Usage: resolver [-s] [hostname | IP | service/protocol/domain ] ...\n");

5
glib/gmessages.h
View File

@ -283,11 +283,12 @@ void g_warn_message (const char *domain,
const char *func,
const char *warnexpr) G_ANALYZER_NORETURN;
GLIB_DEPRECATED
G_NORETURN
void g_assert_warning (const char *log_domain,
const char *file,
const int line,
const char *pretty_function,
const char *expression) G_GNUC_NORETURN;
const char *expression);
GLIB_AVAILABLE_IN_2_56
void g_log_structured_standard (const gchar *log_domain,
@ -399,7 +400,7 @@ void g_log_structured_standard (const gchar *log_domain,
format)
#endif
#else /* no varargs macros */
static void g_error (const gchar *format, ...) G_GNUC_NORETURN G_ANALYZER_NORETURN;
static G_NORETURN void g_error (const gchar *format, ...) G_ANALYZER_NORETURN;
static void g_critical (const gchar *format, ...) G_ANALYZER_NORETURN;
static inline void

2
glib/goption.c
View File

@ -1091,7 +1091,7 @@ g_option_context_get_help (GOptionContext *context,
return g_string_free (string, FALSE);
}
G_GNUC_NORETURN
G_NORETURN
static void
print_help (GOptionContext *context,
gboolean main_help,

2
glib/gspawn.c
View File

@ -1116,7 +1116,7 @@ write_all (gint fd, gconstpointer vbuf, gsize to_write)
/* This function is called between fork() and exec() and hence must be
* async-signal-safe (see signal-safety(7)). */
G_GNUC_NORETURN
G_NORETURN
static void
write_err_and_exit (gint fd, gint msg)
{

3
glib/gtestutils.h
View File

@ -514,11 +514,12 @@ void g_assertion_message (const char *domain,
const char *func,
const char *message) G_ANALYZER_NORETURN;
GLIB_AVAILABLE_IN_ALL
G_NORETURN
void g_assertion_message_expr (const char *domain,
const char *file,
int line,
const char *func,
const char *expr) G_GNUC_NORETURN;
const char *expr);
GLIB_AVAILABLE_IN_ALL
void g_assertion_message_cmpstr (const char *domain,
const char *file,

2
glib/gutils.h
View File

@ -434,7 +434,7 @@ g_bit_storage_impl (gulong number)
# define g_abort() abort ()
#else
GLIB_AVAILABLE_IN_2_50
void g_abort (void) G_GNUC_NORETURN G_ANALYZER_NORETURN;
G_NORETURN void g_abort (void) G_ANALYZER_NORETURN;
#endif
#endif