From: Andre Noll <maan@systemlinux.org>
Date: Sat, 22 Feb 2014 16:29:10 +0000 (+0100)
Subject: Merge branch 't/sync'
X-Git-Tag: v0.5.2~11
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d87806284b9f6be9aab71ccbf0280d273b57eeb3;hp=bb4e94595a1e57e66deacd4efc3512d947f16f19

Merge branch 't/sync'

Cooking since 2014-01-14.

	* t/sync:
	  The sync filter.
	  net: Let maksock() callers perform flowopt cleanup.
	  net: makesock_addrinfo(): Make socketfd local to the loop.
	  net: Let makesock() continue on setsockopt() failure.
	  net: Reduce indentation level in makesock_addrinfo().
	  net: Further simplify makesock_addrinfo().
	  net: Replace the double loop of lookup_address() by a single loop.
	  net: makesock(): Combine code for passive sockets.
	  net: Change makesock_addrinfo() to set given flowopts before SO_REUSEADDR.
	  net: Clarify code flow of makesock_addrinfo().
	  net: Remove unnecessary condition in makesock_addrinfo().
	  net: Remove pointless initialization in makesock_addrinfo().
	  net: Kill dead code in makesock_addrinfo().
	  net: Remove networking headers from para.h.
	  net: Improve error handling of makesock_addrinfo().
	  net: Split makesock(), part 2: Introduce makesock_addrinfo().
	  net: Split makesock(), part 1: Introduce lookup_address().
	  net: Simplify makesock().
	  net: Fix parse_url().
	  net: Correct \return text of parse_url().
---

diff --git a/NEWS b/NEWS
index 51d9db7c..cc9b67ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
 NEWS
 ====
 
+---------------------------------------------
+0.5.2 (to be announced) "orthogonal interior"
+---------------------------------------------
+
+	- The new sync synchronizes playback between multiple clients.
+	- Major cleanup of the networking subsystem.
+	- Minor fixes to avoid clang warnings.
+
 ------------------------------------------
 0.5.1 (2013-12-20) "temporary implication"
 ------------------------------------------
diff --git a/aac_afh.c b/aac_afh.c
index 2d04695a..1610cb2c 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -111,15 +111,15 @@ static void read_tags(unsigned char *buf, size_t buflen, struct afh_info *afhi)
 		q = p + ret + ret2 + 8;
 		if (q + size2 > buf + buflen)
 			break;
-		if (!atom_cmp(type1, "©ART"))
+		if (!atom_cmp(type1, "\xa9" "ART"))
 			afhi->tags.artist = get_tag(q, size2);
-		else if (!atom_cmp(type1, "©alb"))
+		else if (!atom_cmp(type1, "\xa9" "alb"))
 			afhi->tags.album = get_tag(q, size2);
-		else if (!atom_cmp(type1, "©nam"))
+		else if (!atom_cmp(type1, "\xa9" "nam"))
 			afhi->tags.title = get_tag(q, size2);
-		else if (!atom_cmp(type1, "©cmt"))
+		else if (!atom_cmp(type1, "\xa9" "cmt"))
 			afhi->tags.comment = get_tag(q, size2);
-		else if (!atom_cmp(type1, "©day"))
+		else if (!atom_cmp(type1, "\xa9" "day"))
 			afhi->tags.year = get_tag(q, size2);
 		p += size1;
 	}
diff --git a/command.c b/command.c
index 93c68058..fc098b78 100644
--- a/command.c
+++ b/command.c
@@ -559,6 +559,7 @@ static int send_list_of_commands(struct command_context *cc, struct server_comma
 		msg = para_strcat(msg, tmp);
 		free(tmp);
 	}
+	assert(msg);
 	return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
 }
 
diff --git a/udp_recv.c b/udp_recv.c
index 5cd9d9dd..96b6c731 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -48,7 +48,7 @@ static int udp_check_eof(size_t sz, struct iovec iov[2])
 	}
 	if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, iov[0].iov_len) != 0)
 		return 0;
-	if (memcmp(iov[1].iov_base, FEC_EOF_PACKET + iov[0].iov_len,
+	if (memcmp(iov[1].iov_base, &FEC_EOF_PACKET[iov[0].iov_len],
 			FEC_EOF_PACKET_LEN - iov[0].iov_len) != 0)
 		return 0;
 	return -E_RECV_EOF;