replaced mpd_noreturn by G_GNUC_NORETURN

We want to remove gcc.h eventually. This takes care of all the
G_GNUC_NORETURN macros.
This commit is contained in:
Thomas Jansen 2008-12-02 02:42:19 +01:00
parent c252143d51
commit e6ae40982e
4 changed files with 6 additions and 5 deletions

View File

@ -182,7 +182,7 @@ log_func(DEBUG, G_LOG_LEVEL_DEBUG)
#undef log_func #undef log_func
mpd_printf mpd_noreturn void FATAL(const char *fmt, ...) mpd_printf G_GNUC_NORETURN void FATAL(const char *fmt, ...)
{ {
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);

View File

@ -21,6 +21,7 @@
#include "gcc.h" #include "gcc.h"
#include <glib.h>
#include <stdbool.h> #include <stdbool.h>
mpd_printf void ERROR(const char *fmt, ...); mpd_printf void ERROR(const char *fmt, ...);
@ -28,7 +29,7 @@ mpd_printf void LOG(const char *fmt, ...);
mpd_printf void SECURE(const char *fmt, ...); mpd_printf void SECURE(const char *fmt, ...);
mpd_printf void DEBUG(const char *fmt, ...); mpd_printf void DEBUG(const char *fmt, ...);
mpd_printf void WARNING(const char *fmt, ...); mpd_printf void WARNING(const char *fmt, ...);
mpd_printf mpd_noreturn void FATAL(const char *fmt, ...); mpd_printf G_GNUC_NORETURN void FATAL(const char *fmt, ...);
void initLog(bool verbose); void initLog(bool verbose);

View File

@ -99,7 +99,7 @@ void read_state_file(void)
while(fclose(fp) && errno == EINTR) /* nothing */; while(fclose(fp) && errno == EINTR) /* nothing */;
} }
void mpd_noreturn state_file_fatal(void) void G_GNUC_NORETURN state_file_fatal(void)
{ {
FATAL("error parsing state file \"%s\"\n", sfpath); FATAL("error parsing state file \"%s\"\n", sfpath);
} }

View File

@ -19,10 +19,10 @@
#ifndef MPD_STATE_FILE_H #ifndef MPD_STATE_FILE_H
#define MPD_STATE_FILE_H #define MPD_STATE_FILE_H
#include "gcc.h" #include <glib.h>
void write_state_file(void); void write_state_file(void);
void read_state_file(void); void read_state_file(void);
void mpd_noreturn state_file_fatal(void); void G_GNUC_NORETURN state_file_fatal(void);
#endif /* STATE_FILE_H */ #endif /* STATE_FILE_H */