X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=util.cpp;h=d6d39f29ada05dc4437886d61178d190df189d02;hp=2bbffdc13c1aeafe0224014060b23043eca47fb1;hb=71fc5575037bead8b6e927a1fffd199e4fc4514b;hpb=3fd8650ccf3da3960a946d8ac9abc305aec399ce

diff --git a/util.cpp b/util.cpp
index 2bbffdc..d6d39f2 100644
--- a/util.cpp
+++ b/util.cpp
@@ -33,7 +33,9 @@ int make_tempfile(const std::string &contents)
 		ssize_t ret = write(fd, ptr, to_write);
 		if (ret == -1) {
 			log_perror("write");
-			safe_close(fd);
+			if (close(fd) == -1) {
+				log_perror("close");
+			}
 			return -1;
 		}
 
@@ -47,7 +49,17 @@ int make_tempfile(const std::string &contents)
 bool read_tempfile_and_close(int fd, std::string *contents)
 {
 	bool ok = read_tempfile(fd, contents);
-	safe_close(fd);  // Implicitly deletes the file.
+
+	int ret;
+	do {
+		ret = close(fd);  // Implicitly deletes the file.
+	} while (ret == -1 && errno == EINTR);
+	
+	if (ret == -1) {
+		log_perror("close");
+		// Can still continue.
+	}
+
 	return ok;
 }
 
@@ -84,17 +96,3 @@ bool read_tempfile(int fd, std::string *contents)
 
 	return true;
 }
-
-int safe_close(int fd)
-{
-	int ret;
-	do {
-		ret = close(fd);
-	} while (ret == -1 && errno == EINTR);
-
-	if (ret == -1) {
-		log_perror("close()");
-	}
-
-	return ret;
-}