From: Andre Noll <maan@systemlinux.org>
Date: Fri, 28 Nov 2008 21:29:43 +0000 (+0100)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.3.3~13
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=cb4dd13c2327c13d486b6abe572f4af2398b65de;hp=adec423b50f97888553fcfe58459eee151ac4184;p=paraslash.git

Merge commit 'fml/master'
---

diff --git a/alsa_write.c b/alsa_write.c
index 0f0f1f7d..cfae4fb9 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -133,7 +133,7 @@ static int alsa_open(struct writer_node *w)
 		return -E_SW_PARAMS;
 	pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
 		* pad->channels / 8;
-	PARA_INFO_LOG("bytes per frame: %d\n", pad->bytes_per_frame);
+	PARA_INFO_LOG("bytes per frame: %zu\n", pad->bytes_per_frame);
 	if (snd_pcm_nonblock(pad->handle, 1))
 		PARA_ERROR_LOG("failed to set nonblock mode\n");
 	return period_size * pad->bytes_per_frame;
diff --git a/fd.c b/fd.c
index 58851723..d0b5c895 100644
--- a/fd.c
+++ b/fd.c
@@ -285,9 +285,10 @@ int para_opendir(const char *dirname, DIR **dir, int *cwd)
 	if (*dir)
 		return 1;
 	ret = -ERRNO_TO_PARA_ERROR(errno);
-/* Ignore return value of fchdir() and close(). We're busted anyway. */
-	if (cwd)
-		fchdir(*cwd);
+	/* Ignore return value of fchdir() and close(). We're busted anyway. */
+	if (cwd) {
+		int __a_unused ret2 = fchdir(*cwd); /* STFU, gcc */
+	}
 close_cwd:
 	if (cwd)
 		close(*cwd);
diff --git a/signal.c b/signal.c
index f8be2f46..9168e918 100644
--- a/signal.c
+++ b/signal.c
@@ -57,8 +57,15 @@ err_out:
  */
 static void generic_signal_handler(int s)
 {
-	write(signal_pipe[1], &s, sizeof(int));
-	//fprintf(stderr, "got sig %i, write returned %d\n", s, ret);
+	ssize_t ret = write(signal_pipe[1], &s, sizeof(int));
+
+	if (ret == sizeof(int))
+		return;
+	if (ret < 0)
+		PARA_EMERG_LOG("%s\n", strerror(errno));
+	else
+		PARA_EMERG_LOG("short write to signal pipe\n");
+	exit(EXIT_FAILURE);
 }
 
 /**