Clean up a bunch of warnings when building with Xcode 6.1

limelight-common/AudioStream.c

@@ -52,7 +52,7 @@ static void UdpPingThreadProc(void *context) {
 	/* Ping in ASCII */
 	char pingData[] = { 0x50, 0x49, 0x4E, 0x47 };
 	struct sockaddr_in saddr;
-	int err;
+	SOCK_RET err;
 
 	memset(&saddr, 0, sizeof(saddr));
 	saddr.sin_family = AF_INET;
@@ -73,8 +73,9 @@ static void UdpPingThreadProc(void *context) {
 }
 
 static void ReceiveThreadProc(void* context) {
-	int err;
+	SOCK_RET err;
 	PRTP_PACKET rtp;
+    int packetSize;
     char* buffer = NULL;
 
 	while (!PltIsThreadInterrupted(&receiveThread)) {
@@ -95,7 +96,9 @@ static void ReceiveThreadProc(void* context) {
 			return;
 		}
         
-		if (err < sizeof(RTP_PACKET)) {
+        packetSize = (int)err;
+
+		if (packetSize < sizeof(RTP_PACKET)) {
 			// Runt packet
 			continue;
 		}
@@ -106,7 +109,7 @@ static void ReceiveThreadProc(void* context) {
 			continue;
 		}
 
-		memcpy(buffer, &err, sizeof(err));
+		memcpy(buffer, &packetSize, sizeof(int));
 
 		err = LbqOfferQueueItem(&packetQueue, buffer);
 		if (err == LBQ_SUCCESS) {

limelight-common/ControlStream.c

@@ -74,7 +74,7 @@ void connectionLostPackets(int lastReceivedPacket, int nextReceivedPacket) {
 static PNVCTL_PACKET_HEADER readNvctlPacket(void) {
 	NVCTL_PACKET_HEADER staticHeader;
 	PNVCTL_PACKET_HEADER fullPacket;
-	int err;
+	SOCK_RET err;
 
 	err = recv(ctlSock, (char*) &staticHeader, sizeof(staticHeader), 0);
 	if (err != sizeof(staticHeader)) {
@@ -100,7 +100,7 @@ static PNVCTL_PACKET_HEADER readNvctlPacket(void) {
 
 static int sendMessageAndForget(short ptype, short paylen, const void* payload) {
 	NVCTL_PACKET_HEADER header;
-	int err;
+	SOCK_RET err;
 
 	header.type = ptype;
 	header.payloadLength = paylen;

limelight-common/InputStream.c

@@ -87,7 +87,7 @@ void destroyInputStream(void) {
 }
 
 static void inputSendThreadProc(void* context) {
-	int err;
+	SOCK_RET err;
 	PPACKET_HOLDER holder;
 	char encryptedBuffer[MAX_INPUT_PACKET_SIZE];
 	size_t encryptedSize;

limelight-common/Limelight.h

@@ -72,10 +72,10 @@ typedef struct _AUDIO_RENDERER_CALLBACKS {
 
 typedef void(*ConnListenerStageStarting)(int stage);
 typedef void(*ConnListenerStageComplete)(int stage);
-typedef void(*ConnListenerStageFailed)(int stage, int errorCode);
+typedef void(*ConnListenerStageFailed)(int stage, long errorCode);
 
 typedef void(*ConnListenerConnectionStarted)(void);
-typedef void(*ConnListenerConnectionTerminated)(int errorCode);
+typedef void(*ConnListenerConnectionTerminated)(long errorCode);
 
 typedef void(*ConnListenerDisplayMessage)(char* message);
 typedef void(*ConnListenerDisplayTransientMessage)(char* message);

limelight-common/PlatformSockets.h

@@ -9,6 +9,8 @@
 #define SetLastSocketError(x) WSASetLastError(x)
 #define LastSocketError() WSAGetLastError()
 
+typedef int SOCK_RET;
+
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -16,12 +18,14 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
-#define SOCKET int
 #define LastSocketError() errno
 #define SetLastSocketError(x) errno = x
 #define INVALID_SOCKET -1
 #define SOCKET_ERROR -1
 #define closesocket(x) close(x)
+
+typedef int SOCKET;
+typedef ssize_t SOCK_RET;
 #endif
 
 SOCKET connectTcpSocket(IP_ADDRESS dstaddr, unsigned short port);

limelight-common/PlatformThreads.c

@@ -39,7 +39,7 @@ void PltSleepMs(int ms) {
 #if defined(LC_WINDOWS) || defined (LC_WINDOWS_PHONE)
 	WaitForSingleObjectEx(GetCurrentThread(), ms, FALSE);
 #else
-    long usecs = (long)ms * 1000;
+    useconds_t usecs = ms * 1000;
     usleep(usecs);
 #endif
 }

limelight-common/RtspConnection.c

@@ -81,7 +81,8 @@ static int initializeRtspRequest(PRTSP_MESSAGE msg, char* command, char* target)
 
 /* Returns 1 on success, 0 otherwise */
 static int transactRtspMessage(PRTSP_MESSAGE request, PRTSP_MESSAGE response) {
-	int err, ret = 0;
+    SOCK_RET err;
+    int ret = 0;
 	int offset;
 	char* serializedMessage = NULL;
 	int messageLen;

limelight-common/SdpGenerator.c

@@ -82,7 +82,7 @@ static int addAttributeBinary(PSDP_OPTION *head, char* name, const void* payload
 
 static int addAttributeString(PSDP_OPTION *head, char* name, const char* payload) {
 	// We purposefully omit the null terminating character
-	return addAttributeBinary(head, name, payload, strlen(payload));
+	return addAttributeBinary(head, name, payload, (int)strlen(payload));
 }
 
 static PSDP_OPTION getAttributesList(PSTREAM_CONFIGURATION streamConfig, struct in_addr targetAddress) {

limelight-common/VideoStream.c

@@ -39,7 +39,7 @@ void destroyVideoStream(void) {
 static void UdpPingThreadProc(void *context) {
 	char pingData [] = { 0x50, 0x49, 0x4E, 0x47 };
 	struct sockaddr_in saddr;
-	int err;
+	SOCK_RET err;
 
 	memset(&saddr, 0, sizeof(saddr));
 	saddr.sin_family = AF_INET;
@@ -59,7 +59,7 @@ static void UdpPingThreadProc(void *context) {
 }
 
 static void ReceiveThreadProc(void* context) {
-	int err;
+	SOCK_RET err;
 	int bufferSize;
 	char* buffer;
 
@@ -80,7 +80,7 @@ static void ReceiveThreadProc(void* context) {
 		}
 
 		// queueRtpPacket() copies the data it needs to we can reuse the buffer
-		queueRtpPacket((PRTP_PACKET) buffer, err);
+		queueRtpPacket((PRTP_PACKET) buffer, (int)err);
 	}
 
 	free(buffer);
@@ -102,7 +102,7 @@ static void DecoderThreadProc(void* context) {
 
 int readFirstFrame(void) {
 	char* firstFrame;
-	int err;
+	SOCK_RET err;
 	int offset = 0;
 
 	firstFrameSocket = connectTcpSocket(remoteHost, FIRST_FRAME_PORT);