Module Name: src
Committed By: joerg
Date: Fri Nov 13 22:39:35 UTC 2009
Modified Files:
src/sys/compat/linux/common: linux_socket.c
src/sys/compat/linux32/common: linux32_socket.c
Log Message:
Return the result of copyout. Reminded by Niolas Joly.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/linux32/common/linux32_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.105 src/sys/compat/linux/common/linux_socket.c:1.106
--- src/sys/compat/linux/common/linux_socket.c:1.105 Fri Nov 13 21:45:03 2009
+++ src/sys/compat/linux/common/linux_socket.c Fri Nov 13 22:39:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.105 2009/11/13 21:45:03 joerg Exp $ */
+/* $NetBSD: linux_socket.c,v 1.106 2009/11/13 22:39:35 joerg Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.105 2009/11/13 21:45:03 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.106 2009/11/13 22:39:35 joerg Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -1025,9 +1025,7 @@
strncpy(ifr.ifr_name, ifp->if_xname, sizeof(ifr.ifr_name));
- error = copyout(&ifr, data, sizeof(ifr));
-
- return 0;
+ return copyout(&ifr, data, sizeof(ifr));
}
int
Index: src/sys/compat/linux32/common/linux32_socket.c
diff -u src/sys/compat/linux32/common/linux32_socket.c:1.11 src/sys/compat/linux32/common/linux32_socket.c:1.12
--- src/sys/compat/linux32/common/linux32_socket.c:1.11 Fri Nov 13 21:45:03 2009
+++ src/sys/compat/linux32/common/linux32_socket.c Fri Nov 13 22:39:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_socket.c,v 1.11 2009/11/13 21:45:03 joerg Exp $ */
+/* $NetBSD: linux32_socket.c,v 1.12 2009/11/13 22:39:35 joerg Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.11 2009/11/13 21:45:03 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.12 2009/11/13 22:39:35 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -407,9 +407,7 @@
strncpy(ifr.ifr_name, ifp->if_xname, sizeof(ifr.ifr_name));
- error = copyout(&ifr, data, sizeof(ifr));
-
- return 0;
+ return copyout(&ifr, data, sizeof(ifr));
}
int
