export FATAL() with noreturn attribute

This attribute was set in log.c, but not exported to other modules in log.h This allows us to remove some unneccessary variable initializations that were added in r6277. I did audioOutput_shout.c a bit differently, to avoid some jumps. before: $ size src/mpd text data bss dec hex filename 225546 4040 14600 244186 3b9da src/mpd after: $ size src/mpd text data bss dec hex filename 224698 4040 14600 243338 3b68a src/mpd git-svn-id: https://svn.musicpd.org/mpd/trunk@6821 09075e82-0dd4-0310-85a5-a0d7c8717e4f

export FATAL() with noreturn attribute
0f2e9ee6 · Eric Wong · 75e34a19 · 0f2e9ee6 · 0f2e9ee6 · 0f2e9ee6
Commit 0f2e9ee6 authored Aug 27, 2007 by Eric Wong
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 8 deletions

audioOutput_shout.c src/audioOutputs/audioOutput_shout.c +1 -3

listen.c src/listen.c +3 -3

log.h src/log.h +1 -1

state_file.c src/state_file.c +0 -1

No files found.
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -158,9 +158,7 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param)
 	if (blockParam) {
 		if (0 == strcmp(blockParam->value, "yes")) {
 			public = 1;
-		} else if (0 == strcmp(blockParam->value, "no")) {
+		} else if (strcmp(blockParam->value, "no")) {
-			public = 0;
-		} else {
 			FATAL("public \"%s\" is not \"yes\" or \"no\" at line "
 			      "%i\n", param->value, param->line);
 		}

--- a/src/listen.c
+++ b/src/listen.c
@@ -53,7 +53,7 @@ int boundPort;
 static int establishListen(unsigned int port,
                           struct sockaddr *addrp, socklen_t addrlen)
 {
-	int pf = 0;
+	int pf;
 	int sock;
 	int allowReuse = ALLOW_REUSE;
@@ -105,8 +105,8 @@ static int establishListen(unsigned int port,
 static void parseListenConfigParam(unsigned int port, ConfigParam * param)
 {
-	struct sockaddr *addrp = NULL;
+	struct sockaddr *addrp;
-	socklen_t addrlen = 0;
+	socklen_t addrlen;
 	struct sockaddr_in sin;
 #ifdef HAVE_IPV6
 	struct sockaddr_in6 sin6;

--- a/src/log.h
+++ b/src/log.h
@@ -33,7 +33,7 @@ mpd_printf void LOG(const char *fmt, ...);
 mpd_printf void SECURE(const char *fmt, ...);
 mpd_printf void DEBUG(const char *fmt, ...);
 mpd_printf void WARNING(const char *fmt, ...);
-mpd_printf void FATAL(const char *fmt, ...);
+mpd_printf mpd_noreturn void FATAL(const char *fmt, ...);
 void initLog(const int verbose);

--- a/src/state_file.c
+++ b/src/state_file.c
@@ -106,6 +106,5 @@ void read_state_file(void)
 void mpd_noreturn state_file_fatal(void)
 {
 	FATAL("error parsing state file \"%s\"\n", sfpath);
-	exit(EXIT_FAILURE);
 }