From: Dave Murphy <davem@devkitpro.org>
Date: Thu, 12 Feb 2015 15:52:15 +0000 (+0000)
Subject: Merge branch 'master' into devop_socket
X-Git-Tag: v0.4.0~5
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=71a59a1da3464c33cb0a4057d1bbb3e76575c780;p=corbenik%2Fctrulib.git

Merge branch 'master' into devop_socket

Conflicts:
	libctru/source/services/soc/soc_ioctl.c
---

71a59a1da3464c33cb0a4057d1bbb3e76575c780
diff --cc libctru/source/services/soc/soc_ioctl.c
index b6f7117,97fb5cb..ba43a8c
--- a/libctru/source/services/soc/soc_ioctl.c
+++ b/libctru/source/services/soc/soc_ioctl.c
@@@ -25,7 -25,8 +25,7 @@@ int ioctl(int sockfd, int request, ...
  
  		if(value == NULL) {
  			errno = EFAULT;
- 			ret = -1;
 -			va_end(ap);
+ 			return -1;
  		}
  
  		flags = fcntl(sockfd, F_GETFL, 0);