Merge pull request opencontainers#1533 from keloyang/close-negative-descriptor

crosbymichael · web-flow · commit 5951cf5f36e1 · 2017-07-25T09:47:54.000-04:00
Remove the code that close negative descriptor
diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c
@@ -143,8 +143,7 @@ static int write_file(char *data, size_t data_len, char *pathfmt, ...)
 
 	fd = open(path, O_RDWR);
 	if (fd < 0) {
-		ret = -1;
-		goto out;
+		return -1;
 	}
 
 	len = write(fd, data, data_len);

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,7 @@ static int write_file(char data, size_t data_len, char pathfmt, ...)`
`143`	`143`
`144`	`144`	`fd = open(path, O_RDWR);`
`145`	`145`	`if (fd < 0) {`
`146`		`- ret = -1;`
`147`		`- goto out;`
	`146`	`+ return -1;`
`148`	`147`	`}`
`149`	`148`
`150`	`149`	`len = write(fd, data, data_len);`