X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fstring%2Fstring.c;h=6e473af36cf3862580e6c1f706d46861e99dc874;hp=9182ac0650fb7b9c94ba72aa12872ca7f44310d0;hb=be6b32cbe44df085efbae36c07b566bda88c6154;hpb=909bf610f3dfdd5386c7cac24997fd2a72390ace;ds=sidebyside

diff --git a/ccan/string/string.c b/ccan/string/string.c
index 9182ac06..6e473af3 100644
--- a/ccan/string/string.c
+++ b/ccan/string/string.c
@@ -10,6 +10,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include "noerr/noerr.h"
 
 char **strsplit(const void *ctx, const char *string, const char *delims,
 		 unsigned int *nump)
@@ -47,15 +48,6 @@ char *strjoin(const void *ctx, char *strings[], const char *delim)
 	return ret;
 }
 
-static int close_no_errno(int fd)
-{
-	int ret = 0, serrno = errno;
-	if (close(fd) < 0)
-		ret = errno;
-	errno = serrno;
-	return ret;
-}
-
 void *grab_fd(const void *ctx, int fd)
 {
 	int ret;
@@ -91,6 +83,6 @@ void *grab_file(const void *ctx, const char *filename)
 		return NULL;
 
 	buffer = grab_fd(ctx, fd);
-	close_no_errno(fd);
+	close_noerr(fd);
 	return buffer;
 }