git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
um
/
drivers
/
slirp_user.c
diff --git
a/arch/um/drivers/slirp_user.c
b/arch/um/drivers/slirp_user.c
index
cbdbb65
..
edb45d9
100644
(file)
--- a/
arch/um/drivers/slirp_user.c
+++ b/
arch/um/drivers/slirp_user.c
@@
-4,7
+4,6
@@
#include <stddef.h>
#include <sched.h>
#include <string.h>
#include <stddef.h>
#include <sched.h>
#include <string.h>
-#include <sys/fcntl.h>
#include <sys/errno.h>
#include <sys/wait.h>
#include <sys/signal.h>
#include <sys/errno.h>
#include <sys/wait.h>
#include <sys/signal.h>
@@
-48,15
+47,15
@@
static int slirp_tramp(char **argv, int fd)
return(pid);
}
return(pid);
}
-
+
+/* XXX This is just a trivial wrapper around os_pipe */
static int slirp_datachan(int *mfd, int *sfd)
{
int fds[2], err;
err = os_pipe(fds, 1, 1);
static int slirp_datachan(int *mfd, int *sfd)
{
int fds[2], err;
err = os_pipe(fds, 1, 1);
- if(err){
- printk("slirp_datachan: Failed to open pipe, errno = %d\n",
- -err);
+ if(err < 0){
+ printk("slirp_datachan: Failed to open pipe, err = %d\n", -err);
return(err);
}
return(err);
}
@@
-77,7
+76,7
@@
static int slirp_open(void *data)
pid = slirp_tramp(pri->argw.argv, sfd);
if(pid < 0){
pid = slirp_tramp(pri->argw.argv, sfd);
if(pid < 0){
- printk("slirp_tramp failed - errno = %d\n", pid);
+ printk("slirp_tramp failed - errno = %d\n",
-
pid);
os_close_file(sfd);
os_close_file(mfd);
return(pid);
os_close_file(sfd);
os_close_file(mfd);
return(pid);
@@
-97,8
+96,8
@@
static void slirp_close(int fd, void *data)
struct slirp_data *pri = data;
int status,err;
struct slirp_data *pri = data;
int status,err;
-
clos
e(fd);
-
clos
e(pri->slave);
+
os_close_fil
e(fd);
+
os_close_fil
e(pri->slave);
pri->slave = -1;
pri->slave = -1;